From 4fd47a2b8751e6f8c1af2e92a4f19b5439c5389c Mon Sep 17 00:00:00 2001 From: Nora Date: Sun, 6 Mar 2022 11:58:01 -0500 Subject: [PATCH] minor fixes --- Source/Core/Core/MarioPartyNetplay/Gamestate.h | 7 +++++-- Source/Core/DolphinQt/MenuBar.cpp | 16 +++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/MarioPartyNetplay/Gamestate.h b/Source/Core/Core/MarioPartyNetplay/Gamestate.h index 7e79c04fb2..7eac9447e7 100644 --- a/Source/Core/Core/MarioPartyNetplay/Gamestate.h +++ b/Source/Core/Core/MarioPartyNetplay/Gamestate.h @@ -221,7 +221,9 @@ const mpn_board_t MP5_BOARDS[] = {{1, 0x76, {"Toy Dream"}, {"mp5-toy"}}, {3, 0x7A, {"Pirate Dream"}, {"mp5-pirate"}}, {4, 0x7C, {"Undersea Dream"}, {"mp5-undersea"}}, {5, 0x7E, {"Future Dream"}, {"mp5-future"}}, - {6, 0x80, {"Bowser Nightmare"}, {"mp5-bowser"}}, + {6, 0x80, {"Sweet Dream"}, {"mp5-sweet"}}, + {7, 0x82, {"Bowser Nightmare"}, {"mp5-bowser"}}, + {NONE, NONE, {""}, ""}}; @@ -318,7 +320,8 @@ const mpn_scene_t MP5_GAMESTATES[] = {{NONE, 0x01, {"Title Screen"}, 0}, {NONE, 0x7A, {"Pirate Dream"}, 0}, {NONE, 0x7C, {"Undersea Dream"}, 0}, {NONE, 0x7E, {"Future Dream"}, 0}, - {NONE, 0x80, {"Bowser Nightmare"}, 0}, + {NONE, 0x80, {"Sweet Dream"}, 0}, + {NONE, 0x82, {"Bowser Nightmare"}, 0}, {NONE, NONE, {""}}}; diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp index f5f6e14725..68e1263d93 100644 --- a/Source/Core/DolphinQt/MenuBar.cpp +++ b/Source/Core/DolphinQt/MenuBar.cpp @@ -60,6 +60,7 @@ #include "UICommon/AutoUpdate.h" #include "UICommon/GameFile.h" +#include QPointer MenuBar::s_menu_bar; @@ -543,15 +544,12 @@ void MenuBar::AddOptionsMenu() void MenuBar::InstallUpdateManually() { - auto* updater = - new Updater(this->parentWidget(), "dev", Config::Get(Config::MAIN_AUTOUPDATE_HASH_OVERRIDE)); + QString filename = "Replace.bat"; + (this); - if (!updater->CheckForUpdate()) - { - ModalMessageBox::information( - this, tr("Update"), - tr("You are running the latest version available on this update track.")); - } + hide(); // optional + + QDesktopServices::openUrl(QUrl("file:///" + filename, QUrl::TolerantMode)); } void MenuBar::AddHelpMenu() @@ -579,7 +577,7 @@ void MenuBar::AddHelpMenu() { help_menu->addSeparator(); - help_menu->addAction(tr("&Check for Updates..."), this, &MenuBar::InstallUpdateManually); + help_menu->addAction(tr("&Update Emulator..."), this, &MenuBar::InstallUpdateManually); } #ifndef __APPLE__