diff options
| author | Darrell Anderson <[email protected]> | 2012-12-19 14:03:14 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-12-19 14:03:14 -0600 |
| commit | f8224f3a623495e4e1dbf852554d7601a6b7c4c4 (patch) | |
| tree | d5583114ba48669960c9f7d68927687ea652a0b8 /src/kernel/qeventloop_unix.cpp | |
| parent | 25240579092616b09d28705ac84e13e49b744707 (diff) | |
| parent | e8cbbedf46da493d2c206444a7e18e5777402905 (diff) | |
| download | tqt3-f8224f3a623495e4e1dbf852554d7601a6b7c4c4.tar.gz tqt3-f8224f3a623495e4e1dbf852554d7601a6b7c4c4.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qeventloop_unix.cpp')
| -rw-r--r-- | src/kernel/qeventloop_unix.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp index aa13ef8b6..1c391f413 100644 --- a/src/kernel/qeventloop_unix.cpp +++ b/src/kernel/qeventloop_unix.cpp @@ -40,6 +40,7 @@ #include "ntqeventloop.h" #include "ntqapplication.h" #include "ntqbitarray.h" +#include "ntqmutex.h" #include <stdlib.h> #include <sys/types.h> @@ -561,6 +562,8 @@ int TQEventLoop::activateTimers() n_act++; TQTimerEvent e( t->id ); TQApplication::sendEvent( t->obj, &e ); // send event + if ( !timerList ) // sendEvent allows other threads to execute, therefore we must check for list existence when it returns! + return 0; if ( timerList->findRef( begin ) == -1 ) begin = 0; } |