From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 12 Jan 2014 11:43:20 +0000 (+0200)
Subject: Change video mode before reconfiguring the window
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=eba34251cee51134bba7644a84da49583da599f7;p=libs%2Fgui.git

Change video mode before reconfiguring the window

This prevents the window options from getting out of sync if the video
mode can't be set.
---

diff --git a/source/graphics/window.cpp b/source/graphics/window.cpp
index 256ab2d..00acbc4 100644
--- a/source/graphics/window.cpp
+++ b/source/graphics/window.cpp
@@ -62,16 +62,16 @@ void Window::reconfigure(const WindowOptions &opts)
 	bool fullscreen_changed = (opts.fullscreen!=options.fullscreen);
 	resizing = (opts.width!=options.width || opts.height!=options.height);
 
-	options = opts;
-	platform_reconfigure(fullscreen_changed);
-
 	if(visible)
 	{
-		if(options.fullscreen)
-			display.set_mode(VideoMode(options.width, options.height));
+		if(opts.fullscreen)
+			display.set_mode(VideoMode(opts.width, opts.height));
 		else if(fullscreen_changed)
 			display.restore_mode();
 	}
+
+	options = opts;
+	platform_reconfigure(fullscreen_changed);
 }
 
 void Window::set_keyboard_autorepeat(bool r)