From 835c6efd924ed7e62ccd43e064bc6b7f5cdecbfc Mon Sep 17 00:00:00 2001
From: mathusummut <mathusum.mut@gmail.com>
Date: Sat, 31 Mar 2018 17:38:33 +0200
Subject: [PATCH] Fixed X-button getting stuck on Windows

---
 mk/windows/vs2015-64/glest_game.vcxproj.user | 5 ++++-
 source/glest_game/game/game.cpp              | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mk/windows/vs2015-64/glest_game.vcxproj.user b/mk/windows/vs2015-64/glest_game.vcxproj.user
index abe8dd896..b5b74823e 100644
--- a/mk/windows/vs2015-64/glest_game.vcxproj.user
+++ b/mk/windows/vs2015-64/glest_game.vcxproj.user
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)$(TargetName)\</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp
index 9e61f00e6..2412a9b2e 100644
--- a/source/glest_game/game/game.cpp
+++ b/source/glest_game/game/game.cpp
@@ -7056,6 +7056,7 @@ namespace Glest
                  setMarkerKeyAllowsModifier) == true)
           {
             setMarker = true;
+			printf("%d\n", key.keysym.scancode);
           }
           //else if(key == configKeys.getCharKey("TogglePhotoMode")) {
           else
@@ -7479,7 +7480,11 @@ namespace Glest
             showFullConsole = false;
           }
           else if (isKeyPressed (configKeys.getSDLKey ("SetMarker"), key) ==
-                   true)
+                   true
+#ifdef WIN32
+			  || key.keysym.scancode == 5
+#endif
+			  )
           {
             setMarker = false;
           }
@@ -7538,7 +7543,7 @@ namespace Glest
             gameCamera.setMoveX (0);
             camRightButtonDown = false;
             calcCameraMoveX ();
-          }
+		  }
         }
       }
       catch (const exception & ex)