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

GSdx: Fixed GSDialog so that it doesn't cause PCSX2 to minimize into the background when closing the config box. 

PCSX2: Reloads plugins a little less often.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1846 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-09-17 23:49:39 +00:00
parent 34af7c1281
commit e75043b91e
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,7 +416,6 @@ void Panels::PluginSelectorPanel::OnConfigure_Clicked( wxCommandEvent& evt )
wxDynamicLibrary dynlib( (*m_FileList)[(int)m_ComponentBoxes.Get(pid).GetClientData(sel)] );
if( PluginConfigureFnptr configfunc = (PluginConfigureFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"configure" ) )
{
//ScopedWindowDisable disabler( wxGetTopLevelParent( this ) );
wxWindowDisabler disabler;
configfunc();
}

7
pcsx2/gui/Plugins.cpp
View File

@ -173,17 +173,22 @@ void Pcsx2App::ReloadPlugins()
// Posts a message to the App to reload plugins. Plugins are loaded via a background thread
// which is started on a pending event, so don't expect them to be ready "right now."
// If plugins are already loaded then no action is performed.
void LoadPluginsPassive()
{
if( g_plugins ) return;
wxCommandEvent evt( pxEVT_ReloadPlugins );
wxGetApp().AddPendingEvent( evt );
}
// Blocks until plugins have been successfully loaded, or throws an exception if
// the user cancels the loading procedure after error.
// the user cancels the loading procedure after error. If plugins are already loaded
// then no action is performed.
void LoadPluginsImmediate()
{
wxASSERT( wxThread::IsMain() );
if( g_plugins ) return;
static int _reentrant = 0;
EntryGuard guard( _reentrant );

2
plugins/GSdx/GSDialog.cpp
View File

@ -32,7 +32,7 @@ GSDialog::GSDialog(UINT id)
INT_PTR GSDialog::DoModal()
{
return DialogBoxParam(theApp.GetModuleHandle(), MAKEINTRESOURCE(m_id), NULL, DialogProc, (LPARAM)this);
return DialogBoxParam(theApp.GetModuleHandle(), MAKEINTRESOURCE(m_id), GetActiveWindow(), DialogProc, (LPARAM)this);
}
INT_PTR CALLBACK GSDialog::DialogProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)