diff --git a/pcsx2/PluginManager.cpp b/pcsx2/PluginManager.cpp index a2494d7ef8..28b8a23032 100644 --- a/pcsx2/PluginManager.cpp +++ b/pcsx2/PluginManager.cpp @@ -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.")); 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() ); int version = GetLibVersion2( tbl_PluginInfo[pid].typemask ); diff --git a/pcsx2/gui/Panels/PluginSelectorPanel.cpp b/pcsx2/gui/Panels/PluginSelectorPanel.cpp index 8ccaa39a64..3412e15ab8 100644 --- a/pcsx2/gui/Panels/PluginSelectorPanel.cpp +++ b/pcsx2/gui/Panels/PluginSelectorPanel.cpp @@ -642,20 +642,16 @@ void Panels::PluginSelectorPanel::OnConfigure_Clicked( wxCommandEvent& evt ) ScopedCoreThreadPause paused_core( new SysExecEvent_SaveSinglePlugin(pid) ); if (!CorePlugins.AreLoaded()) { - typedef void (CALLBACK* SetDirFnptr)( const char* dir ); - - if( SetDirFnptr func = (SetDirFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"setSettingsDir" ) ) - { - func( GetSettingsFolder().ToString().mb_str(wxConvFile) ); - } - - if( SetDirFnptr func = (SetDirFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"setLogDir" ) ) - { - func( GetLogFolder().ToString().mb_str(wxConvFile) ); - } + CorePlugins.Load(pid, filename); + CorePlugins.SendLogFolder(); + CorePlugins.SendSettingsFolder(); + configfunc(); + CorePlugins.Unload(pid); + } + else + { + configfunc(); } - - configfunc(); } }