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 | |
| parent | a3671a5557bbcc11a346bd89027ddc7710eb3104 (diff) | |
| parent | 7432f7870b2021fe88a6f99aa0d192249fd35ea1 (diff) | |
Merge pull request #1 from LePresidente/new_vfs_library
Updating from LePresidente's changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainwindow.ui | 3 | ||||
| -rw-r--r-- | src/organizercore.cpp | 5 | ||||
| -rw-r--r-- | src/selfupdater.cpp | 3 | ||||
| -rw-r--r-- | src/version.rc | 4 |
4 files changed, 10 insertions, 5 deletions
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; } <property name="text">
<string>Sort</string>
</property>
+ <property name="visible">
+ <bool>false</bool>
+ </property>
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/MO/gui/sort</normaloff>:/MO/gui/sort</iconset>
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;
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);
}
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
|