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

Merge branch 'Alt-FTWizard-GS-Fix' of https://github.com/TheLastRar/PCSX2-Dev9-irq-thread-safer

This commit is contained in:
bositman 2015-06-09 16:27:40 +03:00
parent 4e82073bfc 93a9ba8b6f
commit 5f201e21ee
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/PluginManager.cpp
View File

@ -867,7 +867,7 @@ SysCorePlugins::PluginStatus_t::PluginStatus_t( PluginsEnum_t _pid, const wxStri
.SetUserMsg(_( "The configured %s plugin is not a PCSX2 plugin, or is for an older unsupported version of PCSX2.")); .SetUserMsg(_( "The configured %s plugin is not a PCSX2 plugin, or is for an older unsupported version of PCSX2."));
if( SetEmuVersion != NULL ) if( SetEmuVersion != NULL )
SetEmuVersion( "PCSX2", (0ul << 24) | (9ul<<16) | (7ul<<8) | 0 ); SetEmuVersion("PCSX2", (PCSX2_VersionHi << 24) | (PCSX2_VersionMid << 16) | (PCSX2_VersionLo << 8) | 0);
Name = fromUTF8( GetLibName() ); Name = fromUTF8( GetLibName() );
int version = GetLibVersion2( tbl_PluginInfo[pid].typemask ); int version = GetLibVersion2( tbl_PluginInfo[pid].typemask );

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

@ -642,20 +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) );
}
} }
configfunc();
} }
} }