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

UI: Fix hangs when hot-swapping GS plugins (which was introduced r3357) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3362 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-07-01 17:47:47 +00:00
parent bba618beed
commit ab9f479f70
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/AppCoreThread.cpp
View File

@ -121,6 +121,8 @@ static void _Suspend()
void AppCoreThread::Suspend( bool isBlocking ) void AppCoreThread::Suspend( bool isBlocking )
{ {
if (IsClosed()) return;
if (IsSelf()) if (IsSelf())
{ {
// this should never fail... // this should never fail...

2
pcsx2/gui/MainMenuClicks.cpp
View File

@ -275,7 +275,7 @@ bool MainEmuFrame::_DoSelectIsoBrowser( wxString& result )
bool MainEmuFrame::_DoSelectELFBrowser() bool MainEmuFrame::_DoSelectELFBrowser()
{ {
static const wxChar* elfFilterType = L"ELF Files (.elf)|*.elf;*.ELF|"; static const wxChar* elfFilterType = L"ELF Files (.elf)|*.elf;*.ELF";
wxFileDialog ctrl( this, _("Select ELF file..."), g_Conf->Folders.RunELF.ToString(), wxEmptyString, wxFileDialog ctrl( this, _("Select ELF file..."), g_Conf->Folders.RunELF.ToString(), wxEmptyString,
(wxString)elfFilterType + L"|" + _("All Files (*.*)") + L"|*.*", wxFD_OPEN | wxFD_FILE_MUST_EXIST ); (wxString)elfFilterType + L"|" + _("All Files (*.*)") + L"|*.*", wxFD_OPEN | wxFD_FILE_MUST_EXIST );