From 2db43c9279b994dfaf5f7f74c17b86d6b637aefd Mon Sep 17 00:00:00 2001
From: "SND\\weimingzhi_cp"
 <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Wed, 12 Jan 2011 04:37:52 +0000
Subject: - Fixed: -psxout/-slowboot not effective for GNU/Linux.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@62027 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 gui/Config.c  | 2 +-
 gui/LnxMain.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'gui')

diff --git a/gui/Config.c b/gui/Config.c
index aff4f1ef..8ee8bd81 100644
--- a/gui/Config.c
+++ b/gui/Config.c
@@ -128,7 +128,7 @@ int LoadConfig(PcsxConfig *Conf) {
 	Config.PsxAuto = GetValueb(data, "PsxAuto");
 	Config.Cdda    = GetValueb(data, "Cdda");
 	Config.Debug   = GetValueb(data, "Dbg");
-	Config.PsxOut  = GetValueb(data, "PsxOut");
+	Config.PsxOut  = (Config.PsxOut || GetValueb(data, "PsxOut"));
 	Config.SpuIrq  = GetValueb(data, "SpuIrq");
 	Config.RCntFix = GetValueb(data, "RCntFix");
 	Config.VSyncWA = GetValueb(data, "VSyncWA");
diff --git a/gui/LnxMain.c b/gui/LnxMain.c
index 247bf105..585ceab6 100644
--- a/gui/LnxMain.c
+++ b/gui/LnxMain.c
@@ -284,6 +284,8 @@ int main(int argc, char *argv[]) {
 	textdomain (GETTEXT_PACKAGE);
 #endif
 
+	memset(&Config, 0, sizeof(PcsxConfig));
+
 	// what is the name of the config file?
 	// it may be redefined by -cfg on the command line
 	strcpy(cfgfile_basename, "pcsx.cfg");
@@ -349,7 +351,6 @@ int main(int argc, char *argv[]) {
 		}
 	}
 
-	memset(&Config, 0, sizeof(PcsxConfig));
 	strcpy(Config.Net, "Disabled");
 
 	if (UseGui) gtk_init(NULL, NULL);
@@ -427,9 +428,9 @@ int main(int argc, char *argv[]) {
 
 		CheckCdrom();
 
-		// Auto-detect: get region first, then rcnt-bios reset
-		SysReset();
-
+		// Auto-detect: get region first, then rcnt-bios reset
+		SysReset();
+
 		if (file[0] != '\0') {
 			Load(file);
 		} else {
-- 
cgit v1.2.3