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 #2994 from aserna3/master 

Properly implemented confirm on stop CLI switch
This commit is contained in:
Markus Wick 2015-09-07 14:00:17 +02:00
parent a9a339a00c a5d6072a45
commit 5585c5adc2
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/DolphinWX/Main.cpp
View File

@ -189,9 +189,9 @@ void DolphinApp::OnInitCmdLine(wxCmdLineParser& parser)
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
},
{
wxCMD_LINE_SWITCH, "n", "noconfirm",
"Disable Confirm on Stop",
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL
wxCMD_LINE_OPTION, "c", "confirm",
"Set Confirm on Stop",
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
wxCMD_LINE_OPTION, "v", "video_backend",
@ -239,7 +239,7 @@ bool DolphinApp::OnCmdLineParsed(wxCmdLineParser& parser)
m_use_debugger = parser.Found("debugger");
m_use_logger = parser.Found("logger");
m_batch_mode = parser.Found("batch");
m_no_confirm_stop = parser.Found("noconfirm");
m_confirm_stop = parser.Found("confirm", &m_confirm_setting);
m_select_video_backend = parser.Found("video_backend", &m_video_backend_name);
m_select_audio_emulation = parser.Found("audio_emulation", &m_audio_emulation_name);
m_play_movie = parser.Found("movie", &m_movie_file);
@ -279,8 +279,13 @@ void DolphinApp::AfterInit()
if (!m_batch_mode)
main_frame->UpdateGameList();
if (m_no_confirm_stop)
if (m_confirm_stop)
{
if (m_confirm_setting.Upper() == "TRUE")
SConfig::GetInstance().bConfirmStop = true;
else if (m_confirm_setting.Upper() == "FALSE")
SConfig::GetInstance().bConfirmStop = false;
}
if (m_play_movie && !m_movie_file.empty())
{

3
Source/Core/DolphinWX/Main.h
View File

@ -36,13 +36,14 @@ private:
static bool DolphinEmulatorDotComTextFileExists();
bool m_batch_mode = false;
bool m_no_confirm_stop = false;
bool m_confirm_stop = false;
bool m_load_file = false;
bool m_play_movie = false;
bool m_use_debugger = false;
bool m_use_logger = false;
bool m_select_video_backend = false;
bool m_select_audio_emulation = false;
wxString m_confirm_setting;
wxString m_video_backend_name;
wxString m_audio_emulation_name;
wxString m_user_path;