Merge pull request OpenXcom#883 from ajschult/keyUMR

SupSuper · SupSuper · commit ada6e0a3c7bd · 2014-07-05T15:54:23.000+01:00
only look at SDL_Event.key for key-type events
diff --git a/src/Menu/OptionsVideoState.cpp b/src/Menu/OptionsVideoState.cpp
@@ -569,7 +569,7 @@ void OptionsVideoState::resize(int &dX, int &dY)
 void OptionsVideoState::handle(Action *action)
 {
 	State::handle(action);
-	if (action->getDetails()->key.keysym.sym == SDLK_g && (SDL_GetModState() & KMOD_CTRL) != 0)
+	if (action->getDetails()->type == SDL_KEYDOWN && action->getDetails()->key.keysym.sym == SDLK_g && (SDL_GetModState() & KMOD_CTRL) != 0)
 	{
 		_btnLockMouse->setPressed(Options::captureMouse == SDL_GRAB_ON);
 	}

Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ void OptionsVideoState::resize(int &dX, int &dY)`
`569`	`569`	`void OptionsVideoState::handle(Action *action)`
`570`	`570`	`{`
`571`	`571`	`State::handle(action);`
`572`		`- if (action->getDetails()->key.keysym.sym == SDLK_g && (SDL_GetModState() & KMOD_CTRL) != 0)`
	`572`	`+ if (action->getDetails()->type == SDL_KEYDOWN && action->getDetails()->key.keysym.sym == SDLK_g && (SDL_GetModState() & KMOD_CTRL) != 0)`
`573`	`573`	`{`
`574`	`574`	`_btnLockMouse->setPressed(Options::captureMouse == SDL_GRAB_ON);`
`575`	`575`	`}`