From ef8039ed1dc69b7ff2a5c60222bc6d020a62f583 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Tue, 25 May 2010 05:33:21 +0000 Subject: [PATCH] spu2-x: Fix a bug in my last commit. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3073 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/spu2-x/src/Linux/CfgHelpers.cpp | 2 +- plugins/spu2-x/src/Linux/Config.cpp | 2 ++ plugins/spu2-x/src/Linux/Config.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/spu2-x/src/Linux/CfgHelpers.cpp b/plugins/spu2-x/src/Linux/CfgHelpers.cpp index 89c73d43ff..f7e001b6d9 100644 --- a/plugins/spu2-x/src/Linux/CfgHelpers.cpp +++ b/plugins/spu2-x/src/Linux/CfgHelpers.cpp @@ -39,7 +39,7 @@ void CfgSetSettingsDir(const char* dir) FileLog("CfgSetSettingsDir(%s)\n", dir); path = wxString::FromAscii(dir) + L"/spu2-x.ini"; pathSet = true; - initIni(); + //initIni(); } void CfgWriteBool(const wchar_t* Section, const wchar_t* Name, bool Value) diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp index 68e27c4dea..2462f0970d 100644 --- a/plugins/spu2-x/src/Linux/Config.cpp +++ b/plugins/spu2-x/src/Linux/Config.cpp @@ -257,7 +257,9 @@ void DisplayDialog() void configure() { + initIni(); ReadSettings(); DisplayDialog(); WriteSettings(); + delete spuConfig; } diff --git a/plugins/spu2-x/src/Linux/Config.h b/plugins/spu2-x/src/Linux/Config.h index 0e1a979142..73406a3c36 100644 --- a/plugins/spu2-x/src/Linux/Config.h +++ b/plugins/spu2-x/src/Linux/Config.h @@ -112,4 +112,5 @@ void configure(); void AboutBox(); extern wxFileConfig *spuConfig; extern bool pathSet; +extern void initIni(); #endif // CONFIG_H_INCLUDED