Fixed duplicate cursor after game

CnCNet · Jan 4, 2017 · c622f88 · c622f88
1 parent d4b8040
commit c622f88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/DXMainClient/DXGUI/Generic/GameInProgressWindow.cs b/DXMainClient/DXGUI/Generic/GameInProgressWindow.cs
@@ -25,6 +25,7 @@ public GameInProgressWindow(WindowManager windowManager) : base(windowManager)
 
         private bool initialized = false;
         private bool deletingLogFilesFailed = false;
+        private bool nativeCursorUsed = false;
 
         public override void Initialize()
         {
@@ -86,6 +87,8 @@ private void SharedUILogic_GameProcessStarted()
             Visible = true;
             Enabled = true;
             WindowManager.Cursor.Visible = false;
+            nativeCursorUsed = Game.IsMouseVisible;
+            Game.IsMouseVisible = false;
             ProgramConstants.IsInGame = true;
             Game.TargetElapsedTime = TimeSpan.FromMilliseconds(1000.0 / POWER_SAVING_FPS);
             if (UserINISettings.Instance.MinimizeWindowsOnGameStart)
@@ -101,7 +104,10 @@ private void HandleGameProcessExited()
         {
             Visible = false;
             Enabled = false;
-            WindowManager.Cursor.Visible = true;
+            if (nativeCursorUsed)
+                Game.IsMouseVisible = true;
+            else
+                WindowManager.Cursor.Visible = true;
             ProgramConstants.IsInGame = false;
             Game.TargetElapsedTime = TimeSpan.FromMilliseconds(1000.0 / FPS);
             if (UserINISettings.Instance.MinimizeWindowsOnGameStart)

diff --git a/DXMainClient/Properties/AssemblyInfo.cs b/DXMainClient/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.3.5")]
-[assembly: AssemblyFileVersion("2.0.3.5")]
+[assembly: AssemblyVersion("2.0.3.6")]
+[assembly: AssemblyFileVersion("2.0.3.6")]