Merge pull request #1 from LePresidente/new_vfs_library

Updating from LePresidente's changes

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>

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;

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);
 }
 
 

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