diff --git a/pcsx2/PluginManager.cpp b/pcsx2/PluginManager.cpp index fe99b20651..11317bbcae 100644 --- a/pcsx2/PluginManager.cpp +++ b/pcsx2/PluginManager.cpp @@ -882,7 +882,7 @@ void SysCorePlugins::_generalclose( PluginsEnum_t pid ) void SysCorePlugins::ClosePlugin_GS() { - if( GetMTGS().IsSelf() ) + if( GetMTGS().IsSelf() || GSDump::isRunning ) _generalclose( PluginId_GS ); else { diff --git a/pcsx2/gui/Dialogs/GSDumpDialog.cpp b/pcsx2/gui/Dialogs/GSDumpDialog.cpp index f7f0c29265..e7d2e526b1 100644 --- a/pcsx2/gui/Dialogs/GSDumpDialog.cpp +++ b/pcsx2/gui/Dialogs/GSDumpDialog.cpp @@ -78,6 +78,7 @@ Dialogs::GSDumpDialog::GSDumpDialog(wxWindow* parent) wxBoxSizer* gif = new wxBoxSizer(wxVERTICAL); wxBoxSizer* dumps_list = new wxBoxSizer(wxVERTICAL); + m_run->SetDefault(); wxArrayString rdoverrides; rdoverrides.Add("None"); rdoverrides.Add("OGL SW"); @@ -126,6 +127,7 @@ Dialogs::GSDumpDialog::GSDumpDialog(wxWindow* parent) wxEvtHandler::Connect(wxEVT_FSWATCHER, wxFileSystemWatcherEventHandler(Dialogs::GSDumpDialog::PathChanged)); Bind(wxEVT_LIST_ITEM_SELECTED, &Dialogs::GSDumpDialog::SelectedDump, this, ID_DUMP_LIST); + Bind(wxEVT_LIST_ITEM_ACTIVATED, &Dialogs::GSDumpDialog::RunDump, this, ID_DUMP_LIST); Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::RunDump, this, ID_RUN_DUMP); Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::ToStart, this, ID_RUN_START); Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::StepPacket, this, ID_RUN_STEP);