Migrate to version numbers with buildnumber.

Added Comment for removal of ModBase::isOneof
ModOrganizer2 · Dec 21, 2016 · d1ed7ae · d1ed7ae
1 parent 1cf368c
commit d1ed7ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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);
 }