summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Munro <brian.alexander.munro@gmail.com>2017-10-31 15:24:40 +0200
committerGitHub <noreply@github.com>2017-10-31 15:24:40 +0200
commit9cc196ae3a0ac11324082ae11fb60e0191948ef3 (patch)
tree6614a6746b42cbcf0f0227ae88c09e6d10b7f0ff /src
parent2f1d270c08eb43f043e342accc64b1cd1bbff25f (diff)
parentc8118ea0fa6db5102d4dcc544c4bfe1792c7c7ab (diff)
Merge pull request #114 from Al12rs/QT5.7
Changed segment of while condition in waitForProcessCompletion()
Diffstat (limited to 'src')
-rw-r--r--src/organizercore.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index cba92d8f..09acc0aa 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -1254,7 +1254,7 @@ bool OrganizerCore::waitForProcessCompletion(HANDLE handle, LPDWORD exitCode)
while (
res = ::MsgWaitForMultipleObjects(1, &handle, false, 500,
QS_KEY | QS_MOUSE),
- ((res != WAIT_FAILED) || (res != WAIT_OBJECT_0)) &&
+ ((res != WAIT_FAILED) && (res != WAIT_OBJECT_0)) &&
((m_UserInterface == nullptr) || !m_UserInterface->unlockClicked())) {
if (!::GetVFSProcessList(&numProcesses, processes)) {