[Scummvm-git-logs] scummvm master -> d3a831644c7b9a31b2b74824b7638072a6630fda

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d3a831644c SDL: Grab mouse when ScummVM is started in fullscreen mode


Commit: d3a831644c7b9a31b2b74824b7638072a6630fda
    https://github.com/scummvm/scummvm/commit/d3a831644c7b9a31b2b74824b7638072a6630fda
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-17T12:01:35-06:00

Commit Message:
SDL: Grab mouse when ScummVM is started in fullscreen mode

Changed paths:
    backends/platform/sdl/sdl-window.cpp


diff --git a/backends/platform/sdl/sdl-window.cpp b/backends/platform/sdl/sdl-window.cpp
index b38a97c..39c5f86 100644
--- a/backends/platform/sdl/sdl-window.cpp
+++ b/backends/platform/sdl/sdl-window.cpp
@@ -279,10 +279,11 @@ bool SdlWindow::createOrUpdateWindow(int width, int height, uint32 flags) {
 		}
 
 		SDL_SetWindowFullscreen(_window, fullscreenFlags);
-		const bool shouldGrab = (flags & SDL_WINDOW_INPUT_GRABBED) | fullscreenFlags;
-		SDL_SetWindowGrab(_window, shouldGrab ? SDL_TRUE : SDL_FALSE);
 	}
 
+	const bool shouldGrab = (flags & SDL_WINDOW_INPUT_GRABBED) || fullscreenFlags;
+	SDL_SetWindowGrab(_window, shouldGrab ? SDL_TRUE : SDL_FALSE);
+
 	if (!_window) {
 		return false;
 	}