Fix GUI position/size after restarting from full-window or fullscreen mode.

diff --git a/main.cpp b/main.cpp
index 4cd1a84909d2824d80cc4f47f524529e95a00910..5cb4865409f84b598b07cbf1c60279ace307c3c0 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -852,9 +852,6 @@ void uae_restart(struct uae_prefs *p, int opengui, const TCHAR *cfgfile)
        if (cfgfile)
                _tcscpy (restart_config, cfgfile);
        target_restart ();
-       p->gfx_apmode[0].gfx_fullscreen = GFX_WINDOW;
-       p->gfx_apmode[1].gfx_fullscreen = GFX_WINDOW;
-
 }
 
 #ifndef DONT_PARSE_CMDLINE

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 541d76812aaecc6e28eb35f07ad013d0ac720470..35ac9d3bd736fe89f55d245d9409e4955eb1abee 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -22050,7 +22050,7 @@ static HWND updatePanel (int id, UINT action)
                        left = r.left;
                        top = r.top;
                        if (!gui_fullscreen) {
-                               if (isfullscreen () == 0) {
+                               if (full_property_sheet || isfullscreen () == 0) {
                                        regsetint (NULL, _T("GUIPosX"), left);
                                        regsetint (NULL, _T("GUIPosY"), top);
                                } else if (isfullscreen () < 0) {
@@ -22279,7 +22279,7 @@ void getguipos(int *xp, int *yp)
                x = gui_fullscreen_rect.left;
                y = gui_fullscreen_rect.top;
        } else {
-               if (isfullscreen() == 0) {
+               if (full_property_sheet || isfullscreen() == 0) {
                        regqueryint(NULL, _T("GUIPosX"), &x);
                        regqueryint(NULL, _T("GUIPosY"), &y);
                } else if (isfullscreen() < 0) {