Fixed X-button getting stuck on Windows

This commit is contained in:
mathusummut
2018-03-31 17:38:33 +02:00
parent 020fe77906
commit 835c6efd92
2 changed files with 11 additions and 3 deletions

View File

@@ -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>

View File

@@ -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)