medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Don't wait longer than 10 sec for the task thread to terminate

Browse source 
If the current task is stuck for too long after being canceled it's probably
stuck forever. Let "too long" be 10 seconds. And let it get stuck forever in
debug build only.
This commit is contained in:
Slava Monich 2015-07-02 15:25:07 +03:00
parent 22884ccdf3
commit fd0852a60d
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main.cpp
View file

@ -54,6 +54,16 @@
#include <QGuiApplication> #include <QGuiApplication>
// If the current task is stuck for too long after being canceled it's
// probably stuck forever. Let "too long" be 10 seconds.
#if HARBOUR_DEBUG
// But let it get stuck forever in debug build
# define TASK_QUEUE_TIMEOUT (-1)
#else
// There's no reason to wait forever in release build though.
# define TASK_QUEUE_TIMEOUT (10000)
#endif
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
QGuiApplication* app = SailfishApp::application(argc, argv); QGuiApplication* app = SailfishApp::application(argc, argv);
@ -85,7 +95,7 @@ int main(int argc, char **argv)
BooksConfigManager configManager; BooksConfigManager configManager;
if (ZLibrary::init(argc, argv)) { if (ZLibrary::init(argc, argv)) {
ZLibrary::run(NULL); ZLibrary::run(NULL);
BooksTaskQueue::waitForDone(); BooksTaskQueue::waitForDone(TASK_QUEUE_TIMEOUT);
ZLibrary::shutdown(); ZLibrary::shutdown();
} }