From 8b0d0dba7b20cc56b21769e4f08510528726d223 Mon Sep 17 00:00:00 2001 From: mattmenke Date: Sun, 13 Sep 2009 02:37:55 +0000 Subject: [PATCH] Gui: Fixed fix. Last fix was close, but a couple lines too high. Oops. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1814 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/AppMain.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index 414bcd8398..e3dc7d5823 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -560,7 +560,7 @@ void Pcsx2App::ApplySettings( const AppConfig& newconf ) const PluginInfo* pi = tbl_PluginInfo-1; while( ++pi, pi->shortname != NULL ) { - if( newconf.FullpathTo( pi->id ) != newconf.FullpathTo( pi->id ) ) + if( newconf.FullpathTo( pi->id ) != g_Conf->FullpathTo( pi->id ) ) break; } if( pi->shortname != NULL ) @@ -568,9 +568,14 @@ void Pcsx2App::ApplySettings( const AppConfig& newconf ) // [TODO] : Post notice that this shuts down existing emulation. SysEndExecution(); safe_delete( g_plugins ); + // Think safe to do this earlier, but not positive. + // Have to update the config *before* loading the new plugins. + *g_Conf = newconf; LoadPlugins(); } - *g_Conf = newconf; + else { + *g_Conf = newconf; + } } g_Conf->Apply();