restructure main loops

source/ngc/menu.cpp

@@ -1082,6 +1082,7 @@ MainMenu (int selectedMenu)
 
 			case -1: // Button B
 				// Return to Game
+				if(SNESROMSize > 0)
 					quit = 1;
 				break;
 		}

source/ngc/snes9xGX.cpp

@@ -78,9 +78,9 @@ void ExitCleanup()
 {
 	LWP_SuspendThread (devicethread);
 	UnmountAllFAT();
-	CloseShare();
 
 #ifdef HW_RVL
+	CloseShare();
 	DI_Close();
 #endif
 }
@@ -192,17 +192,44 @@ void setFrameTimerMethod()
 extern void S9xInitSync();
 bool CheckVideo = 0; // for forcing video reset in video.cpp
 extern uint32 prevRenderedFrameCount;
+static int selectedMenu = -1;
 
 void
 emulate ()
 {
-	S9xSetSoundMute (TRUE);
+	while (1)
-	AudioStart ();
+	{
-	S9xInitSync(); // Eke-Eke: initialize frame Sync
+		// go back to checking if devices were inserted/removed
+		// since we're entering the menu
+		LWP_ResumeThread (devicethread);
 
+		ConfigRequested = 1;
+
+		if(SNESROMSize > 0 && selectedMenu != 2)
+			selectedMenu = 2;
+
+		MainMenu (selectedMenu); // go to menu
+
+		ConfigRequested = 0;
+
+		Settings.SuperScopeMaster = (GCSettings.Superscope > 0 ? true : false);
+		Settings.MouseMaster = (GCSettings.Mouse > 0 ? true : false);
+		Settings.JustifierMaster = (GCSettings.Justifier > 0 ? true : false);
+		SetControllers ();
+
+		// stop checking if devices were removed/inserted
+		// since we're starting emulation again
+		LWP_SuspendThread (devicethread);
+
+		ResetVideo_Emu();
+
+		FrameTimer = 0;
 		setFrameTimerMethod(); // set frametimer method every time a ROM is loaded
 
-	while (1)
+		CheckVideo = 1;	// force video update
+		prevRenderedFrameCount = IPPU.RenderedFramesCount;
+
+		while(1)
 		{
 			S9xMainLoop ();
 			NGCReportButtons ();
@@ -245,47 +272,12 @@ emulate ()
 					ShutdownWii();
 				#endif
 
-			// GUI Stuff
-			/*
-			gui_alloc();
-			gui_makebg ();
-			gui_clearscreen();
-			gui_draw ();
-			gui_showscreen ();
-			//gui_savescreen ();
-			*/
-
-			MainMenu (2); // go to game menu
-
 				// save zoom level
 				SavePrefs(SILENT);
-
+				break;
-			FrameTimer = 0;
+			}
-			setFrameTimerMethod (); // set frametimer method every time a ROM is loaded
+		}
-
+	}
-			Settings.SuperScopeMaster = (GCSettings.Superscope > 0 ? true : false);
-			Settings.MouseMaster = (GCSettings.Mouse > 0 ? true : false);
-			Settings.JustifierMaster = (GCSettings.Justifier > 0 ? true : false);
-			SetControllers ();
-			//S9xReportControllers ();
-
-			ConfigRequested = 0;
-
-			#ifdef _DEBUG_VIDEO
-			// log stuff
-			fprintf(debughandle, "\n\nPlaying ROM: %s", Memory.ROMFilename);
-			fprintf(debughandle, "\nrender: %u", GCSettings.render);
-			#endif
-
-			CheckVideo = 1;	// force video update
-			prevRenderedFrameCount = IPPU.RenderedFramesCount;
-
-			// stop checking if devices were removed/inserted
-			// since we're starting emulation again
-			LWP_SuspendThread (devicethread);
-		}//if ConfigRequested
-
-	}//while
 }
 
 void CreateAppPath(char origpath[])
@@ -337,8 +329,6 @@ main(int argc, char *argv[])
 	DI_Init();	// first
 	#endif
 
-	int selectedMenu = -1;
-	
 	#ifdef DEBUG_WII
 	DEBUG_Init(GDBSTUB_DEVICE_USB, 1);	// init debugging
 	//_break();
@@ -464,16 +454,10 @@ main(int argc, char *argv[])
 	}
 	#endif
 
-	// Get the user to load a ROM
+	S9xSetSoundMute (TRUE);
-	while (SNESROMSize <= 0)
+	AudioStart ();
-	{
+	S9xInitSync(); // initialize frame sync
-		MainMenu (selectedMenu);
-	}
 
 	// Emulate
 	emulate ();
-
-	// NO! - We're never leaving here!
-	while (1);
-		return 0;
 }