diff options
| author | ZachHaber <zhaber2@illinois.edu> | 2016-12-27 14:53:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-27 14:53:03 -0600 |
| commit | f0810bfa43fa032ca2c4714e788177f537392b68 (patch) | |
| tree | 89153b734e6b5f3dfb36dd1ab3f4d5b0209b6e20 /src/organizercore.cpp | |
| parent | a3671a5557bbcc11a346bd89027ddc7710eb3104 (diff) | |
| parent | 7432f7870b2021fe88a6f99aa0d192249fd35ea1 (diff) | |
Merge pull request #1 from LePresidente/new_vfs_library
Updating from LePresidente's changes
Diffstat (limited to 'src/organizercore.cpp')
| -rw-r--r-- | src/organizercore.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/organizercore.cpp b/src/organizercore.cpp index d91e2423..142c9eba 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1239,11 +1239,12 @@ bool OrganizerCore::waitForProcessCompletion(HANDLE handle, LPDWORD exitCode) DWORD res;
// Wait for a an event on the handle, a key press, mouse click or timeout
+ //TODO: Remove MOBase::isOneOf from this query as it was always returning true.
while (
res = ::MsgWaitForMultipleObjects(1, &handle, false, 500,
QS_KEY | QS_MOUSE),
- (MOBase::isOneOf(res, {WAIT_FAILED, WAIT_OBJECT_0}) &&
- ((m_UserInterface == nullptr) || !m_UserInterface->unlockClicked()))) {
+ ((res != WAIT_FAILED) && (res != WAIT_OBJECT_0)) &&
+ ((m_UserInterface == nullptr) || !m_UserInterface->unlockClicked())) {
if (!::GetVFSProcessList(&numProcesses, processes)) {
break;
|