From 56570960efd3725948131384cc1f82b3e8269989 Mon Sep 17 00:00:00 2001
From: Kelvin Lee <kiyolee@hotmail.com>
Date: Sun, 11 Sep 2016 07:58:26 +1000
Subject: [PATCH] Renamed g_restart to g_bRestart.

---
 source/Applewin.cpp | 8 ++++----
 source/Applewin.h   | 2 +-
 source/Frame.cpp    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/Applewin.cpp b/source/Applewin.cpp
index 0d2b62db..6b2cffce 100644
--- a/source/Applewin.cpp
+++ b/source/Applewin.cpp
@@ -78,7 +78,7 @@ TCHAR     g_sProgramDir[MAX_PATH] = TEXT(""); // Directory of where AppleWin exe
 TCHAR     g_sDebugDir  [MAX_PATH] = TEXT(""); // TODO: Not currently used
 TCHAR     g_sScreenShotDir[MAX_PATH] = TEXT(""); // TODO: Not currently used
 TCHAR     g_sCurrentDir[MAX_PATH] = TEXT(""); // Also Starting Dir.  Debugger uses this when load/save
-bool      g_restart = false;
+bool      g_bRestart = false;
 bool      g_bRestartFullScreen = false;
 
 DWORD		g_dwSpeed		= SPEED_NORMAL;	// Affected by Config dialog's speed slider bar
@@ -1091,7 +1091,7 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
 	do
 	{
 		// DO INITIALIZATION THAT MUST BE REPEATED FOR A RESTART
-		g_restart = false;
+		g_bRestart = false;
 		ResetToLogoMode();
 
 		LoadConfiguration();
@@ -1202,7 +1202,7 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
 		EnterMessageLoop();
 		LogFileOutput("Main: LeaveMessageLoop()\n");
 
-		if (g_restart)
+		if (g_bRestart)
 		{
 			bSetFullScreen = g_bRestartFullScreen;
 			g_bRestartFullScreen = false;
@@ -1214,7 +1214,7 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
 		sg_Mouse.Uninitialize();	// Maybe restarting due to switching slot-4 card from MouseCard to Mockingboard
 		LogFileOutput("Main: sg_Mouse.Uninitialize()\n");
 	}
-	while (g_restart);
+	while (g_bRestart);
 
 	// Release COM
 	DSUninit();
diff --git a/source/Applewin.h b/source/Applewin.h
index 5cadf6c9..b9af8c1b 100644
--- a/source/Applewin.h
+++ b/source/Applewin.h
@@ -33,7 +33,7 @@ void SetLoadedSaveStateFlag(const bool bFlag);
 extern TCHAR      g_sProgramDir[MAX_PATH];
 extern TCHAR      g_sCurrentDir[MAX_PATH];
 
-extern bool       g_restart;
+extern bool       g_bRestart;
 extern bool       g_bRestartFullScreen;
 
 extern DWORD      g_dwSpeed;
diff --git a/source/Frame.cpp b/source/Frame.cpp
index da4400bb..db8aafce 100644
--- a/source/Frame.cpp
+++ b/source/Frame.cpp
@@ -994,7 +994,7 @@ LRESULT CALLBACK FrameWndProc (
 
     case WM_CLOSE:
       LogFileOutput("WM_CLOSE\n");
-      if (g_bIsFullScreen && g_restart)
+      if (g_bIsFullScreen && g_bRestart)
 		  g_bRestartFullScreen = true;
       if (g_bIsFullScreen)
         SetNormalMode();
@@ -1092,7 +1092,7 @@ LRESULT CALLBACK FrameWndProc (
       DragAcceptFiles(window,0);
 	  Snapshot_Shutdown();
       DebugDestroy();
-      if (!g_restart) {
+      if (!g_bRestart) {
         DiskDestroy();
         ImageDestroy();
         HD_Destroy();
@@ -1688,7 +1688,7 @@ LRESULT CALLBACK FrameWndProc (
 	  // . Changed slot configuration
 	  // . Changed disk speed (normal or enhanced)
 	  // . Changed Freeze F8 rom setting
-      g_restart = true;
+      g_bRestart = true;
       PostMessage(window,WM_CLOSE,0,0);
       break;