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 #4976 from ligfx/fixwxcommandlineassertion 

DolphinWX: provide empty OnCmdLineParsed
This commit is contained in:
Scott Mansell 2017-02-27 15:10:01 +13:00 committed by GitHub
parent 7bcff99d89 a3e3986906
commit d1b343ab5a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,11 @@ void DolphinApp::OnInitCmdLine(wxCmdLineParser& parser)
parser.SetCmdLine("");
}
bool DolphinApp::OnCmdLineParsed(wxCmdLineParser& parser)
{
return true;
}
bool DolphinApp::OnInit()
{
std::lock_guard<std::mutex> lk(s_init_mutex);

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

@ -23,6 +23,7 @@ public:
private:
bool OnInit() override;
void OnInitCmdLine(wxCmdLineParser& parser) override;
bool OnCmdLineParsed(wxCmdLineParser& parser) override;
int OnExit() override;
void OnFatalException() override;
bool Initialize(int& c, wxChar** v) override;