From d1ed7ae5d74ee7cba30ad8973cf64c0d29b427aa Mon Sep 17 00:00:00 2001
From: LePresidente <brian.alexander.munro@gmail.com>
Date: Wed, 21 Dec 2016 00:54:41 -0800
Subject: [PATCH] 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(-)

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index e30a165d1..6ce156c82 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 46d146dc6..142c9eba2 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 1b6b46842..3e98a5ec1 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);
 }