Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-06 13:46:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly run Qt event loop

Browse Source 
Check RsControlModule.processShouldExit() via a lazy timer
this should guarantee QCoreApplication enough autonomy to gracefully
handle any event specially stop
This commit is contained in:
Gioacchino Mazzurco 2018-01-25 15:14:09 +01:00
parent d80a806d2a
commit c1d8d6a52d
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
retroshare-android-service/src/service.cpp
View File

@ -1,6 +1,6 @@
/*
* RetroShare Android Service
* Copyright (C) 2016-2017 Gioacchino Mazzurco <gio@eigenlab.org>
* Copyright (C) 2016-2018 Gioacchino Mazzurco <gio@eigenlab.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -18,8 +18,8 @@
#include <QCoreApplication>
#include <QDebug>
#include <QMetaObject>
#include <QDir>
#include <QTimer>
#ifdef __ANDROID__
# include "util/androiddebug.h"
@ -52,16 +52,10 @@ int main(int argc, char *argv[])
ApiServerLocal apiServerLocal(&api, sockPath); (void) apiServerLocal;
while (!ctrl_mod.processShouldExit())
{
app.processEvents();
usleep(20000);
}
/* Since QCoreApplication::quit() is a no-op until the event loop has been
* started, we need to defer the call until it starts. Thus, we queue a
* deferred method call to quit() */
QMetaObject::invokeMethod(&app, "quit", Qt::QueuedConnection);
QTimer shouldExitTimer;
QObject::connect( &shouldExitTimer, &QTimer::timeout, [&](){
if(ctrl_mod.processShouldExit()) app.quit(); });
shouldExitTimer.start();
return app.exec();
}