From e5aad8b802a1410487f31c4ece2b293d0b15c608 Mon Sep 17 00:00:00 2001
From: dborth <dborth@0aaa047c-bd49-0410-9b25-49477284f1fd>
Date: Fri, 1 May 2009 00:51:08 +0000
Subject: [PATCH] fix PAL sound stuttering (Issue 101), multiple snapshots now
 work (Issues 90/99)

---
 source/ngc/fceugx.cpp              | 5 ++++-
 source/ngc/fceugx.h                | 2 +-
 source/ngc/gui/gui_savebrowser.cpp | 4 ++--
 source/ngc/menu.cpp                | 1 -
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/ngc/fceugx.cpp b/source/ngc/fceugx.cpp
index 901b7c4..b335c32 100644
--- a/source/ngc/fceugx.cpp
+++ b/source/ngc/fceugx.cpp
@@ -261,7 +261,7 @@ int main(int argc, char *argv[])
 	cleanSFMDATA(); // clear state data
 
 	FCEUI_SetSoundQuality(1); // 0 - low, 1 - high, 2 - high (alt.)
-	FCEUI_SetVidSystem(GCSettings.timing); // causes a small 'pop' in the audio
+	int currentTiming = 0;
 
     while (1) // main loop
     {
@@ -277,6 +277,9 @@ int main(int argc, char *argv[])
 		else
 			MainMenu(MENU_GAME);
 
+		if(currentTiming != GCSettings.timing)
+			FCEUI_SetVidSystem(GCSettings.timing); // causes a small 'pop' in the audio
+
 		videoReset = -1;
 		currentMode = GCSettings.render;
 		ConfigRequested = 0;
diff --git a/source/ngc/fceugx.h b/source/ngc/fceugx.h
index a4a405f..7287500 100644
--- a/source/ngc/fceugx.h
+++ b/source/ngc/fceugx.h
@@ -32,9 +32,9 @@ enum {
 };
 
 enum {
-	FILE_ROM,
 	FILE_RAM,
 	FILE_STATE,
+	FILE_ROM,
 	FILE_FDSBIOS,
 	FILE_CHEAT,
 	FILE_PREF
diff --git a/source/ngc/gui/gui_savebrowser.cpp b/source/ngc/gui/gui_savebrowser.cpp
index 2dff361..ce122f3 100644
--- a/source/ngc/gui/gui_savebrowser.cpp
+++ b/source/ngc/gui/gui_savebrowser.cpp
@@ -312,8 +312,8 @@ void GuiSaveBrowser::Update(GuiTrigger * t)
 		{
 			saveDate[0]->SetText(NULL);
 			saveDate[1]->SetText(NULL);
-			saveTime[0]->SetText("New SRAM");
-			saveTime[1]->SetText("New Snapshot");
+			saveTime[0]->SetText("New RAM");
+			saveTime[1]->SetText("New State");
 			saveType[0]->SetText(NULL);
 			saveType[1]->SetText(NULL);
 			savePreviewImg[0]->SetImage(gameSaveBlank);
diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp
index ed99cef..48e595c 100644
--- a/source/ngc/menu.cpp
+++ b/source/ngc/menu.cpp
@@ -2876,7 +2876,6 @@ static int MenuSettingsVideo()
 
 			case 4: // timing
 				GCSettings.timing ^= 1;
-				FCEUI_SetVidSystem(GCSettings.timing); // causes a small 'pop' in the audio
 				break;
 
 			case 5: