From d58b2a17cdc6e3f6ad3691bb59bd999a0b449f15 Mon Sep 17 00:00:00 2001
From: "SND\\shalma_cp" <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Sat, 11 Dec 2010 17:54:31 +0000
Subject: wndmain.c, lnxmain.c, gtk2gui.c, emuthread.m - Patch 7713 - (dario86)
 Detect PAL demos (SCED) - (dario86) Fix PAL auto-detection with root counter
 init

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61080 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 gui/Gtk2Gui.c | 27 +++++++++++++++------------
 gui/LnxMain.c |  4 +++-
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'gui')

diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index 674d1ba4..059598bd 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -467,6 +467,7 @@ void OnFile_RunExe() {
 				g_free(file);
 				SysRunGui();
 			} else {
+				// Auto-detect: get region first, then rcnt-bios reset
 				SysReset();
 
 				if (Load(file) == 0) {
@@ -501,8 +502,6 @@ void OnFile_RunCd() {
 		return;
 	}
 
-	SysReset();
-
 	if (CheckCdrom() == -1) {
 		/* Only check the CD if we are starting the console with a CD */
 		ClosePlugins();
@@ -511,6 +510,9 @@ void OnFile_RunCd() {
 		return;
 	}
 
+	// Auto-detect: get region first, then rcnt-bios reset
+	SysReset();
+
 	// Read main executable directly from CDRom and start it
 	if (LoadCdrom() == -1) {
 		ClosePlugins();
@@ -641,8 +643,6 @@ void OnFile_RunImage() {
 		return;
 	}
 
-	SysReset();
-
 	if (CheckCdrom() == -1) {
 		// Only check the CD if we are starting the console with a CD
 		ClosePlugins();
@@ -651,6 +651,9 @@ void OnFile_RunImage() {
 		return;
 	}
 
+	// Auto-detect: get region first, then rcnt-bios reset
+	SysReset();
+
 	// Read main executable directly from CDRom and start it
 	if (LoadCdrom() == -1) {
 		ClosePlugins();
@@ -691,12 +694,13 @@ void OnEmu_Reset() {
 		return;
 	}
 
-	SysReset();
-
 	if (CheckCdrom() != -1) {
 		LoadCdrom();
 	}
 
+	// Auto-detect: get region first, then rcnt-bios reset
+	SysReset();
+
 	psxCpu->Execute();
 }
 
@@ -794,11 +798,6 @@ void state_load(gchar *state_filename) {
 
 	ret = CheckState(state_filename);
 
-	if (ret == 0) {
-		SysReset();
-		ret = LoadState(state_filename);
-	}
-
 	if (ret == 0) {
 		// Check the CD-ROM is valid
 		if (CheckCdrom() == -1) {
@@ -806,7 +805,11 @@ void state_load(gchar *state_filename) {
 			SysRunGui();
 			return;
 		}
-
+
+		// Auto-detect: region first, then rcnt reset
+		SysReset();
+		ret = LoadState(state_filename);
+
 		sprintf(Text, _("Loaded state %s."), state_filename);
 		GPU_displayText(Text);
 	} else {
diff --git a/gui/LnxMain.c b/gui/LnxMain.c
index f64939b4..36f15464 100644
--- a/gui/LnxMain.c
+++ b/gui/LnxMain.c
@@ -424,9 +424,11 @@ int main(int argc, char *argv[]) {
 			return 1;
 		}
 
-		SysReset();
 		CheckCdrom();
 
+		// Auto-detect: get region first, then rcnt-bios reset
+		SysReset();
+
 		if (file[0] != '\0') {
 			Load(file);
 		} else {
-- 
cgit v1.2.3