Change video mode before reconfiguring the window

[libs/gui.git] / source / graphics / window.cpp

diff --git a/source/graphics/window.cpp b/source/graphics/window.cpp
index 166e49f716fc8f63944015360b8806068ff325b6..00acbc459446a6d410d12d876f4bb7662f4265f0 100644 (file)
--- 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)
@@ -86,7 +86,7 @@ void Window::show()
 
        if(options.fullscreen)
        {
-               display.set_mode(VideoMode(options.width, options.height));
+               display.set_mode(VideoMode(options.width, options.height), true);
                warp_pointer(options.width/2, options.height/2);
        }
 }