From a3e39869067477e9e3d96da4a90e318497826663 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sun, 26 Feb 2017 17:35:31 -0800 Subject: [PATCH] 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). --- Source/Core/DolphinWX/Main.cpp | 5 +++++ Source/Core/DolphinWX/Main.h | 1 + 2 files changed, 6 insertions(+) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 8b1f5c4fd9..934697ddab 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -84,6 +84,11 @@ void DolphinApp::OnInitCmdLine(wxCmdLineParser& parser) parser.SetCmdLine(""); } +bool DolphinApp::OnCmdLineParsed(wxCmdLineParser& parser) +{ + return true; +} + bool DolphinApp::OnInit() { std::lock_guard lk(s_init_mutex); diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h index 25bc303ef5..46f3d80e91 100644 --- a/Source/Core/DolphinWX/Main.h +++ b/Source/Core/DolphinWX/Main.h @@ -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;