Win32 - Memwatch - added Cancel option to Save Changes? message box

changelog.txt

@@ -1,4 +1,5 @@
 ---version 2.0.4 yet to be released---
+25-feb-2009 - adelikat - 2in32 - Memwatch - added cancel to save changes? message box
 22-feb-2009 - adelikat - win32 - Lua - made speedmode("turbo") turn on turbo (which employs frameskipping) rather than max speed
 22-feb-2009 - adelikat - Increased lua gui.text height (and DrawTextTransWH() height)
 21-feb-2009 - adelikat - win32 - Lua - Added -lua commandline argment, loads a lua script on startup

src/drivers/win/main.cpp

@@ -379,6 +379,8 @@ void DoFCEUExit()
 	if(exiting)    //Eh, oops.  I'll need to try to fix this later.
 		return;
 
+	if (CloseMemoryWatch())		//If user was asked to save changes in the memory watch dialog, and chose cancel, don't close FCEUX!	
+	{
 		if(goptions & GOO_CONFIRMEXIT)
 		{
 			//Wolfenstein 3D had cute exit messages.
@@ -398,7 +400,7 @@ void DoFCEUExit()
 			}
 		}
 
-	CloseMemoryWatch();	
+		
 
 		KillDebugger(); //mbg merge 7/19/06 added
 
@@ -408,6 +410,7 @@ void DoFCEUExit()
 		exiting = 1;
 		closeGame = true;//mbg 6/30/06 - for housekeeping purposes we need to exit after the emulation cycle finishes
 		}
+}
 
 void FCEUD_OnCloseGame()
 {

src/drivers/win/memwatch.cpp

@@ -631,24 +631,34 @@ void OpenMemwatchRecentFile(int memwRFileNumber)
 		//TODO: Remove this file from the recent list
 }
 
-void CloseMemoryWatch()
+bool CloseMemoryWatch()
 {
+	int result = 0;	//Flag for asking to save changes
+
 	if(hwndMemWatch)
 	{
 		SaveStrings();
 
-		if (fileChanged==true)
+		if (fileChanged)
 		{
-			if(MessageBox(hwndMemWatch, "Save Changes?", "Memory Watch Settings", MB_YESNO)==IDYES)
+			result = MessageBox(hwndMemWatch, "Save Changes?", "Memory Watch Settings", MB_YESNOCANCEL);
+			if (result == IDYES)
 			{
 				SaveMemWatch();
-			}
-		}
-
 				DestroyWindow(hwndMemWatch);
 				hwndMemWatch=0;
+				return true;	//true = User did not choose to cancel operation
+			}
+			else if (result == IDNO)
+			{
+				DestroyWindow(hwndMemWatch);
+				hwndMemWatch=0;
+				return true;	//Don't run SaveMemWatch, but return true
+			}
+			else
+				return false;	//User requested cancel, so abort the attempt to close
+		}
 	}
-
 }
 
 //New File
@@ -764,7 +774,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 		switch(LOWORD(wParam))
 		{
 		case MEMW_FILE_CLOSE:  
-			CloseMemoryWatch();
+			if (CloseMemoryWatch())
 				RamChangeInitialize = false;
 			break;
 

src/drivers/win/memwatch.h

@@ -1,6 +1,6 @@
 void UpdateMemWatch();
 void CreateMemWatch();
-void CloseMemoryWatch();
+bool CloseMemoryWatch();
 void AddMemWatch(char memaddress[32]);
 void RamChange();
 extern char * MemWatchDir;