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

Merge pull request #2326 from JosJuice/isoproperties-config-block 

ISOProperties: Don't block when opening default INI in text editor
This commit is contained in:
Ryan Houdek 2015-05-25 23:42:26 -04:00
parent 5911dd528a db1d81ebf8
commit b0b5f4d10d
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -1181,7 +1181,7 @@ bool CISOProperties::SaveGameConfig()
return success;
}
void CISOProperties::LaunchExternalEditor(const std::string& filename)
void CISOProperties::LaunchExternalEditor(const std::string& filename, bool wait_until_closed)
{
#ifdef __APPLE__
// wxTheMimeTypesManager is not yet implemented for wxCocoa
@ -1204,18 +1204,25 @@ void CISOProperties::LaunchExternalEditor(const std::string& filename)
if (OpenCommand.IsEmpty())
{
WxUtils::ShowErrorDialog(_("Couldn't find open command for extension 'ini'!"));
return;
}
long result;
if (wait_until_closed)
result = wxExecute(OpenCommand, wxEXEC_SYNC);
else
result = wxExecute(OpenCommand);
if (result == -1)
{
if (wxExecute(OpenCommand, wxEXEC_SYNC) == -1)
WxUtils::ShowErrorDialog(_("wxExecute returned -1 on application run!"));
WxUtils::ShowErrorDialog(_("wxExecute returned -1 on application run!"));
return;
}
if (wait_until_closed)
bRefreshList = true; // Just in case
#endif
bRefreshList = true; // Just in case
// Once we're done with the ini edit, give the focus back to Dolphin
SetFocus();
}
void CISOProperties::OnEditConfig(wxCommandEvent& WXUNUSED (event))
@ -1227,7 +1234,7 @@ void CISOProperties::OnEditConfig(wxCommandEvent& WXUNUSED (event))
std::fstream blankFile(GameIniFileLocal, std::ios::out);
blankFile.close();
}
LaunchExternalEditor(GameIniFileLocal);
LaunchExternalEditor(GameIniFileLocal, true);
GameIniLocal.Load(GameIniFileLocal);
LoadGameConfig();
}
@ -1284,7 +1291,7 @@ void CISOProperties::OnShowDefaultConfig(wxCommandEvent& WXUNUSED (event))
{
std::string path = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + filename;
if (File::Exists(path))
LaunchExternalEditor(path);
LaunchExternalEditor(path, false);
}
}

2
Source/Core/DolphinWX/ISOProperties.h
View File

@ -188,7 +188,7 @@ private:
IDM_BNRSAVEAS
};
void LaunchExternalEditor(const std::string& filename);
void LaunchExternalEditor(const std::string& filename, bool wait_until_closed);
void CreateGUIControls();
void OnClose(wxCloseEvent& event);