From 34483ab7a104bba1787125c319c10be4d1d5ec1b Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Sun, 6 May 2001 01:03:47 +0000
Subject: [PATCH] Improved window position code

---
 zsnes/src/gui/gui.asm     | 6 +++---
 zsnes/src/win/winlink.cpp | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index 1cb970b5..cc8d2477 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -546,9 +546,9 @@ NEWSYM UseCubicSpline, db 1
 NEWSYM LargeSoundBuf, db 0
 NEWSYM HighPriority, db 0
 NEWSYM AlwaysOnTop, db 0
-NEWSYM SaveMainWindowPos, db 2
-NEWSYM MainWindowX, dw 0
-NEWSYM MainWindowY, dw 0
+NEWSYM SaveMainWindowPos, db 1
+NEWSYM MainWindowX, dw -1
+NEWSYM MainWindowY, dw -1
 
 GUIsave equ $-GUIRAdd
 
diff --git a/zsnes/src/win/winlink.cpp b/zsnes/src/win/winlink.cpp
index 6531364f..763a3eaf 100644
--- a/zsnes/src/win/winlink.cpp
+++ b/zsnes/src/win/winlink.cpp
@@ -188,8 +188,8 @@ extern BYTE LargeSoundBuf;
 extern BYTE HighPriority;
 extern BYTE AlwaysOnTop;
 extern BYTE SaveMainWindowPos;
-extern WORD MainWindowX;
-extern WORD MainWindowY;
+extern signed short int MainWindowX;
+extern signed short int MainWindowY;
 extern int CurKeyPos;
 extern int CurKeyReadPos;
 extern int KeyBuffer[16];
@@ -1412,9 +1412,7 @@ void initwinvideo(void)
       if(FullScreen==1) {X=0; Y=0;}
       if(hMainWindow) CloseWindow(hMainWindow);
 
-      if (SaveMainWindowPos == 1) { X = MainWindowX; Y = MainWindowY; }
-
-      if (SaveMainWindowPos == 2) SaveMainWindowPos = 1;
+      if (SaveMainWindowPos == 1 && MainWindowX != -1) { X = MainWindowX; Y = MainWindowY; }
 
       hMainWindow = CreateWindow( "ZSNESWIN", WinName, WS_VISIBLE|WS_POPUP,X,Y,  //WS_OVERLAPPED "ZSNESWIN"
                                  WindowWidth,WindowHeight,NULL,NULL,hInst,NULL);