ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
mattmenke 2009-09-13 02:37:55 +00:00
parent 8643bf8455
commit 8b0d0dba7b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/gui/AppMain.cpp
View File

@ -560,7 +560,7 @@ void Pcsx2App::ApplySettings( const AppConfig& newconf )
const PluginInfo* pi = tbl_PluginInfo-1; const PluginInfo* pi = tbl_PluginInfo-1;
while( ++pi, pi->shortname != NULL ) 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; break;
} }
if( pi->shortname != NULL ) if( pi->shortname != NULL )
@ -568,10 +568,15 @@ void Pcsx2App::ApplySettings( const AppConfig& newconf )
// [TODO] : Post notice that this shuts down existing emulation. // [TODO] : Post notice that this shuts down existing emulation.
SysEndExecution(); SysEndExecution();
safe_delete( g_plugins ); 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(); LoadPlugins();
} }
else {
*g_Conf = newconf; *g_Conf = newconf;
} }
}
g_Conf->Apply(); g_Conf->Apply();
if( m_MainFrame != NULL ) if( m_MainFrame != NULL )