From 1cf368c126a558278765e00b8ea2a0791d9e88f8 Mon Sep 17 00:00:00 2001 From: LePresidente Date: Tue, 20 Dec 2016 03:18:43 -0800 Subject: Reverted use of MOBase::isOneOf was causing the lock to fail. --- src/organizercore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/organizercore.cpp b/src/organizercore.cpp index d91e2423..46d146dc 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1242,8 +1242,8 @@ bool OrganizerCore::waitForProcessCompletion(HANDLE handle, LPDWORD exitCode) 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; -- cgit v1.3.1 From d1ed7ae5d74ee7cba30ad8973cf64c0d29b427aa Mon Sep 17 00:00:00 2001 From: LePresidente Date: Wed, 21 Dec 2016 00:54:41 -0800 Subject: Migrate to version numbers with buildnumber. Added Comment for removal of ModBase::isOneof --- src/mainwindow.ui | 3 +++ src/organizercore.cpp | 1 + src/selfupdater.cpp | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/mainwindow.ui b/src/mainwindow.ui index e30a165d..6ce156c8 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -732,6 +732,9 @@ p, li { white-space: pre-wrap; } Sort + + false + :/MO/gui/sort:/MO/gui/sort diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 46d146dc..142c9eba 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1239,6 +1239,7 @@ 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), diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp index 1b6b4684..3e98a5ec 100644 --- a/src/selfupdater.cpp +++ b/src/selfupdater.cpp @@ -105,7 +105,8 @@ SelfUpdater::SelfUpdater(NexusInterface *nexusInterface) m_MOVersion = VersionInfo(version.dwFileVersionMS >> 16, version.dwFileVersionMS & 0xFFFF, - version.dwFileVersionLS >> 16); + version.dwFileVersionLS >> 16, + version.dwFileVersionLS & 0xFFFF); } -- cgit v1.3.1 From 71b4911c8ce56e01aa7aac7f16beabf3980a6918 Mon Sep 17 00:00:00 2001 From: LePresidente Date: Wed, 21 Dec 2016 00:55:51 -0800 Subject: Build Number Version Bump. --- src/version.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/version.rc b/src/version.rc index bc5ba58e..6710bc30 100644 --- a/src/version.rc +++ b/src/version.rc @@ -1,7 +1,7 @@ #include "Winver.h" -#define VER_FILEVERSION 2,0,8 -#define VER_FILEVERSION_STR "2.0.8beta\0" +#define VER_FILEVERSION 2,0,8,1 +#define VER_FILEVERSION_STR "2.0.8.1beta\0" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION -- cgit v1.3.1 From 71f9c4f69dc75e1a7cf90098b68130f15cb039e7 Mon Sep 17 00:00:00 2001 From: Brian Munro Date: Wed, 21 Dec 2016 11:46:10 +0200 Subject: Update organizercore.cpp Shoud be an "or" query instead of "and", --- src/organizercore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 142c9eba..2eb071c1 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1243,7 +1243,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)) { -- cgit v1.3.1 From 7432f7870b2021fe88a6f99aa0d192249fd35ea1 Mon Sep 17 00:00:00 2001 From: Brian Munro Date: Wed, 21 Dec 2016 13:11:23 +0200 Subject: Reverted Change Reverted silly edit. --- src/organizercore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 2eb071c1..142c9eba 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1243,7 +1243,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)) { -- cgit v1.3.1