diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:54:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:54:34 -0600 |
| commit | 85e23da660cc38aa36026664631e9effcb53726b (patch) | |
| tree | 5daf0998c4c154b41fc500204e55c97d83534510 /src/kernel/qapplication.cpp | |
| parent | 67196343e4fac61834c980d6ccd4d9b661e781b6 (diff) | |
| parent | cb6a50aa2564adf03b5ccd87b8ee0e68947d3a61 (diff) | |
| download | tqt-85e23da660cc38aa36026664631e9effcb53726b.tar.gz tqt-85e23da660cc38aa36026664631e9effcb53726b.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qapplication.cpp')
| -rw-r--r-- | src/kernel/qapplication.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 7aefd35b8..d67df12b0 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -545,7 +545,7 @@ public: TQThreadInstance::setCurrentThread(this); // thread should be running and not finished for the lifetime - // of the application (even if QCoreApplication goes away) + // of the application (even if TQCoreApplication goes away) d->running = true; d->finished = false; d->eventLoop = NULL; @@ -2931,7 +2931,14 @@ int TQApplication::exec() */ void TQApplication::exit( int retcode ) { - tqApp->eventLoop()->exit( retcode ); + TQThread* thread = tqApp->guiThread(); + if (thread) { + if (thread->d) { + if (thread->d->eventLoop) { + thread->d->eventLoop->exit( retcode ); + } + } + } } /*! |