mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-25 11:46:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor fixes

Browse source
This commit is contained in:
Nora 2022-03-06 11:58:01 -05:00
commit 4fd47a2b87
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Core/Core/MarioPartyNetplay/Gamestate.h
View file

@ -221,7 +221,9 @@ const mpn_board_t MP5_BOARDS[] = {{1, 0x76, {"Toy Dream"}, {"mp5-toy"}},
{3, 0x7A, {"Pirate Dream"}, {"mp5-pirate"}}, {3, 0x7A, {"Pirate Dream"}, {"mp5-pirate"}},
{4, 0x7C, {"Undersea Dream"}, {"mp5-undersea"}}, {4, 0x7C, {"Undersea Dream"}, {"mp5-undersea"}},
{5, 0x7E, {"Future Dream"}, {"mp5-future"}}, {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, {""}, ""}}; {NONE, NONE, {""}, ""}};
@ -318,7 +320,8 @@ const mpn_scene_t MP5_GAMESTATES[] = {{NONE, 0x01, {"Title Screen"}, 0},
{NONE, 0x7A, {"Pirate Dream"}, 0}, {NONE, 0x7A, {"Pirate Dream"}, 0},
{NONE, 0x7C, {"Undersea Dream"}, 0}, {NONE, 0x7C, {"Undersea Dream"}, 0},
{NONE, 0x7E, {"Future Dream"}, 0}, {NONE, 0x7E, {"Future Dream"}, 0},
{NONE, 0x80, {"Bowser Nightmare"}, 0}, {NONE, 0x80, {"Sweet Dream"}, 0},
{NONE, 0x82, {"Bowser Nightmare"}, 0},
{NONE, NONE, {""}}}; {NONE, NONE, {""}}};

16
Source/Core/DolphinQt/MenuBar.cpp
View file

@ -60,6 +60,7 @@
#include "UICommon/AutoUpdate.h" #include "UICommon/AutoUpdate.h"
#include "UICommon/GameFile.h" #include "UICommon/GameFile.h"
#include <qprocess.h>
QPointer<MenuBar> MenuBar::s_menu_bar; QPointer<MenuBar> MenuBar::s_menu_bar;
@ -543,15 +544,12 @@ void MenuBar::AddOptionsMenu()
void MenuBar::InstallUpdateManually() void MenuBar::InstallUpdateManually()
{ {
auto* updater = QString filename = "Replace.bat";
new Updater(this->parentWidget(), "dev", Config::Get(Config::MAIN_AUTOUPDATE_HASH_OVERRIDE)); (this);
if (!updater->CheckForUpdate()) hide(); // optional
{
ModalMessageBox::information( QDesktopServices::openUrl(QUrl("file:///" + filename, QUrl::TolerantMode));
this, tr("Update"),
tr("You are running the latest version available on this update track."));
}
} }
void MenuBar::AddHelpMenu() void MenuBar::AddHelpMenu()
@ -579,7 +577,7 @@ void MenuBar::AddHelpMenu()
{ {
help_menu->addSeparator(); help_menu->addSeparator();
help_menu->addAction(tr("&Check for Updates..."), this, &MenuBar::InstallUpdateManually); help_menu->addAction(tr("&Update Emulator..."), this, &MenuBar::InstallUpdateManually);
} }
#ifndef __APPLE__ #ifndef __APPLE__