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

Use CorePlugins to load plugins during FT Config

This commit is contained in:
TheLastRar 2015-06-06 12:09:19 +01:00 committed by Gregory Hainaut
parent 430f2159ff
commit 3636ebda3c
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pcsx2/gui/Panels/PluginSelectorPanel.cpp
View File

@ -642,31 +642,16 @@ void Panels::PluginSelectorPanel::OnConfigure_Clicked( wxCommandEvent& evt )
ScopedCoreThreadPause paused_core( new SysExecEvent_SaveSinglePlugin(pid) ); ScopedCoreThreadPause paused_core( new SysExecEvent_SaveSinglePlugin(pid) );
if (!CorePlugins.AreLoaded()) if (!CorePlugins.AreLoaded())
{ {
typedef void (CALLBACK* SetDirFnptr)( const char* dir ); CorePlugins.Load(pid, filename);
CorePlugins.SendLogFolder();
if( SetDirFnptr func = (SetDirFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"setSettingsDir" ) ) CorePlugins.SendSettingsFolder();
{ configfunc();
func( GetSettingsFolder().ToString().mb_str(wxConvFile) ); CorePlugins.Unload(pid);
} }
else
if( SetDirFnptr func = (SetDirFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"setLogDir" ) ) {
{ configfunc();
func( GetLogFolder().ToString().mb_str(wxConvFile) );
}
//FIX for GSDX loading old config GUI, Code taken from PluginManager.cpp
#ifdef __linux__
_PS2EsetEmuVersion SetEmuVersion = NULL;
#else
_PS2EsetEmuVersion SetEmuVersion = (_PS2EsetEmuVersion)dynlib.GetSymbol(L"PS2EsetEmuVersion");
#endif
if (SetEmuVersion != NULL)
SetEmuVersion("PCSX2", (PCSX2_VersionHi << 24) | (PCSX2_VersionMid << 16) | (PCSX2_VersionLo << 8) | 0);
} }
configfunc();
} }
} }