Migrate to version numbers with buildnumber.

Added Comment for removal of ModBase::isOneof

3 files changed, 6 insertions, 1 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 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);

 }