summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2011-10-07 12:45:40 (GMT)
committerJan-Arve Saether <jan-arve.saether@nokia.com>2011-10-07 12:45:40 (GMT)
commita0feeef52efde872c6d6e458c8e15616da0bf74f (patch)
tree8c846d041bbce0ac4f10eac1b1b93250144f7f60 /src/corelib/kernel
parent74251fb0fc57b1e0f7db0b561e4aa4c0347f6f37 (diff)
downloadQt-a0feeef52efde872c6d6e458c8e15616da0bf74f.zip
Qt-a0feeef52efde872c6d6e458c8e15616da0bf74f.tar.gz
Qt-a0feeef52efde872c6d6e458c8e15616da0bf74f.tar.bz2
fix possible race conditions
the initialization guard must be set after the initialization is done; for the code assumed to be only executed in a single thread, this change was done just for consistency - in order to avoid similar issues by copy-pasting in future Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qeventdispatcher_win.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 3e367b7..365b28e 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -327,7 +327,6 @@ static void resolveTimerAPI()
if (triedResolve)
return;
#endif
- triedResolve = true;
#ifndef Q_OS_WINCE
QSystemLibrary library(QLatin1String("Mmtimer"));
#else
@@ -337,6 +336,8 @@ static void resolveTimerAPI()
qtimeSetEvent = (ptimeSetEvent)library.resolve("timeSetEvent");
qtimeKillEvent = (ptimeKillEvent)library.resolve("timeKillEvent");
}
+
+ triedResolve = true;
}
}