mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-28 19:58:53 +00:00
Merge Upstream Dolphin code (#3)
* Debugger: Fix warning on Debian builder Fix "braces around scalar initializer [-Wbraced-scalar-init]" warning * Fix manual update check which was hardcoded to "dev" track * OGLRender: Log video backend info, in addition to showing it via OSD This is mainly intended for debugging fifo.ci. * FileUtil: Remove redundant statement * Qt/GeneralPane: Don't trigger config change events when populating GUI. * more stuff * buildbot from dolphin-mpn-src to dolphin-mpn-advanced-src * Fix Netplay Traversal Error * Update linux.yml * Update macos.yml * Update linux.yml * NANDImporter: Make a class variable for the NAND root * fix linux buildbot * rename binary automatically to dolphin-mpn * NANDImporter: Improve NANDFSTEntry `uid` is a u32, not a u16. Also, everything is big endian, so we can simplify the code a little bit. * NANDImporter: Reduce recursion in `ProcessEntry` It also simplifies the code flow, as it no longer goes backwards through the filesystem chain. * NANDImporter: Don't pass paths if we don't need to * NANDImporter: Make superblocks less magical Create a struct describing the superblock layout and use it directly without needing to specify offsets and such. * NANDImporter: Only read the AES key once There is no need to constantly reset the key for every file entry. * Common: Make DynamicLibrary non-copyable The default implementations of DynamicLibrary's copy and move constructors and assignment operators are unsafe. * minor fixes Co-authored-by: Dentomologist <dentomologist@gmail.com> Co-authored-by: Pierre Bourdon <delroth@gmail.com> Co-authored-by: Pokechu22 <Pokechu022@gmail.com> Co-authored-by: Admiral H. Curtiss <pikachu025@gmail.com> Co-authored-by: JosJuice <josjuice@gmail.com> Co-authored-by: Starsam80 <samraskauskas@gmail.com> Co-authored-by: Léo Lam <leo@leolam.fr>
This commit is contained in:
parent
d6098f5499
commit
b788d33717
13 changed files with 223 additions and 182 deletions
|
@ -60,6 +60,7 @@
|
|||
|
||||
#include "UICommon/AutoUpdate.h"
|
||||
#include "UICommon/GameFile.h"
|
||||
#include <qprocess.h>
|
||||
|
||||
QPointer<MenuBar> MenuBar::s_menu_bar;
|
||||
|
||||
|
@ -541,19 +542,6 @@ void MenuBar::AddOptionsMenu()
|
|||
m_change_font = options_menu->addAction(tr("&Font..."), this, &MenuBar::ChangeDebugFont);
|
||||
}
|
||||
|
||||
void MenuBar::InstallUpdateManually()
|
||||
{
|
||||
auto* updater =
|
||||
new Updater(this->parentWidget(), "dev", Config::Get(Config::MAIN_AUTOUPDATE_HASH_OVERRIDE));
|
||||
|
||||
if (!updater->CheckForUpdate())
|
||||
{
|
||||
ModalMessageBox::information(
|
||||
this, tr("Update"),
|
||||
tr("You are running the latest version available on this update track."));
|
||||
}
|
||||
}
|
||||
|
||||
void MenuBar::AddHelpMenu()
|
||||
{
|
||||
QMenu* help_menu = addMenu(tr("&Help"));
|
||||
|
@ -575,13 +563,6 @@ void MenuBar::AddHelpMenu()
|
|||
QUrl(QStringLiteral("https://bugs.dolphin-emu.org/projects/emulator")));
|
||||
});
|
||||
|
||||
if (AutoUpdateChecker::SystemSupportsAutoUpdates())
|
||||
{
|
||||
help_menu->addSeparator();
|
||||
|
||||
help_menu->addAction(tr("&Check for Updates..."), this, &MenuBar::InstallUpdateManually);
|
||||
}
|
||||
|
||||
#ifndef __APPLE__
|
||||
help_menu->addSeparator();
|
||||
#endif
|
||||
|
@ -1170,7 +1151,7 @@ void MenuBar::CheckNAND()
|
|||
|
||||
void MenuBar::NANDExtractCertificates()
|
||||
{
|
||||
if (DiscIO::NANDImporter().ExtractCertificates(File::GetUserPath(D_WIIROOT_IDX)))
|
||||
if (DiscIO::NANDImporter().ExtractCertificates())
|
||||
{
|
||||
ModalMessageBox::information(this, tr("Success"),
|
||||
tr("Successfully extracted certificates from NAND"));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue