From 6e796a74fbe1aa6b1ad4d752397062e1186a5150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 26 Nov 2017 18:32:28 +0100 Subject: [PATCH 1/2] Qt: Add support for --exec --- Source/Core/DolphinQt2/Main.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt2/Main.cpp b/Source/Core/DolphinQt2/Main.cpp index 1a9b66cbae..8b29f6590c 100644 --- a/Source/Core/DolphinQt2/Main.cpp +++ b/Source/Core/DolphinQt2/Main.cpp @@ -86,7 +86,11 @@ int main(int argc, char* argv[]) &app, &Core::HostDispatchJobs); std::unique_ptr boot; - if (options.is_set("nand_title")) + if (options.is_set("exec")) + { + boot = BootParameters::GenerateFromFile(static_cast(options.get("exec"))); + } + else if (options.is_set("nand_title")) { const std::string hex_string = static_cast(options.get("nand_title")); if (hex_string.length() == 16) From 291c99217e87b93d99139a72c6422605edcf3fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 26 Nov 2017 18:33:07 +0100 Subject: [PATCH 2/2] Qt: Fix NAND import menu item parent --- Source/Core/DolphinQt2/MenuBar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt2/MenuBar.cpp b/Source/Core/DolphinQt2/MenuBar.cpp index 485e72190d..aaea20cbc7 100644 --- a/Source/Core/DolphinQt2/MenuBar.cpp +++ b/Source/Core/DolphinQt2/MenuBar.cpp @@ -123,7 +123,7 @@ void MenuBar::AddToolsMenu() // Label will be set by a NANDRefresh later m_boot_sysmenu = AddAction(tools_menu, QStringLiteral(""), this, [this] { emit BootWiiSystemMenu(); }); - m_import_backup = AddAction(gc_ipl, tr("Import BootMii NAND Backup..."), this, + m_import_backup = AddAction(tools_menu, tr("Import BootMii NAND Backup..."), this, [this] { emit ImportNANDBackup(); }); m_check_nand = AddAction(tools_menu, tr("Check NAND..."), this, &MenuBar::CheckNAND); m_extract_certificates = AddAction(tools_menu, tr("Extract Certificates from NAND"), this,