summaryrefslogtreecommitdiff
path: root/zen/thread.cpp
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2021-03-03 01:18:05 +0000
committerB Stack <bgstack15@gmail.com>2021-03-03 01:18:05 +0000
commit320f1ae680d73da35a0cfe4846eb687d8616bcac (patch)
tree6fb17404841b30822a2d9204e3e0932e55f05ebb /zen/thread.cpp
parentMerge branch '11.6' into 'master' (diff)
parentadd upstream 11.7 (diff)
downloadFreeFileSync-320f1ae680d73da35a0cfe4846eb687d8616bcac.tar.gz
FreeFileSync-320f1ae680d73da35a0cfe4846eb687d8616bcac.tar.bz2
FreeFileSync-320f1ae680d73da35a0cfe4846eb687d8616bcac.zip
Merge branch '11.7' into 'master'11.7
add upstream 11.7 See merge request opensource-tracking/FreeFileSync!31
Diffstat (limited to 'zen/thread.cpp')
-rw-r--r--zen/thread.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/zen/thread.cpp b/zen/thread.cpp
index 89fa0233..e14afac7 100644
--- a/zen/thread.cpp
+++ b/zen/thread.cpp
@@ -28,7 +28,7 @@ const std::thread::id globalMainThreadId = std::this_thread::get_id();
bool zen::runningOnMainThread()
{
- if (globalMainThreadId == std::thread::id()) //called during static initialization!
+ if (globalMainThreadId == std::thread::id()) //if called during static initialization!
return true;
return std::this_thread::get_id() == globalMainThreadId;
bgstack15