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

DolphinWX: provide empty OnCmdLineParsed 

Starting in #4916, upon startup wxWidgets pops up an assertion error:

> ./src/common/cmdline.cpp(527): assert ""Assert failure"" failed in
> FindOptionByAnyName(): Unknown option verbose

Fix this by overriding wxApp::OnCmdLineParsed to disable the default
handling (since we also disable the default options in
DolphinApp::OnInitCmdLine).
This commit is contained in:
Michael Maltese 2017-02-26 17:35:31 -08:00
parent 7bcff99d89
commit a3e3986906
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(""); parser.SetCmdLine("");
} }
bool DolphinApp::OnCmdLineParsed(wxCmdLineParser& parser)
{
return true;
}
bool DolphinApp::OnInit() bool DolphinApp::OnInit()
{ {
std::lock_guard<std::mutex> lk(s_init_mutex); std::lock_guard<std::mutex> lk(s_init_mutex);

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

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