diff options
| author | Jeremy Rimpo <jeremy.rimpo@servermonkey.com> | 2017-10-30 17:45:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 17:45:03 -0500 |
| commit | 5cb0d1cb3d8e003d8a58ddb180cf3c1f58241580 (patch) | |
| tree | 54b755f6d92bbcbb375884e63e7657a94eb0b54b /src/organizercore.cpp | |
| parent | 88452e5d76467fc687a9c4d6b6aaf7381d2463e1 (diff) | |
| parent | d53591c6c9c2702d361a70417f37f4508fc43552 (diff) | |
Merge pull request #2 from Al12rs/QT5.7
Merge upstream + potential while fix
Diffstat (limited to 'src/organizercore.cpp')
| -rw-r--r-- | src/organizercore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 9ae8beae..4857590d 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)) {
|