ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6221 from leoetlino/qt-small-fixes 

Qt: Small fixes
This commit is contained in:
Leo Lam 2017-11-27 13:21:34 +01:00 committed by GitHub
parent 96e094e127 291c99217e
commit 9fe5dd7fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt2/Main.cpp
View File

@ -86,7 +86,11 @@ int main(int argc, char* argv[])
&app, &Core::HostDispatchJobs); &app, &Core::HostDispatchJobs);
std::unique_ptr<BootParameters> boot; std::unique_ptr<BootParameters> boot;
if (options.is_set("nand_title")) if (options.is_set("exec"))
{
boot = BootParameters::GenerateFromFile(static_cast<const char*>(options.get("exec")));
}
else if (options.is_set("nand_title"))
{ {
const std::string hex_string = static_cast<const char*>(options.get("nand_title")); const std::string hex_string = static_cast<const char*>(options.get("nand_title"));
if (hex_string.length() == 16) if (hex_string.length() == 16)

2
Source/Core/DolphinQt2/MenuBar.cpp
View File

@ -123,7 +123,7 @@ void MenuBar::AddToolsMenu()
// Label will be set by a NANDRefresh later // Label will be set by a NANDRefresh later
m_boot_sysmenu = m_boot_sysmenu =
AddAction(tools_menu, QStringLiteral(""), this, [this] { emit BootWiiSystemMenu(); }); 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(); }); [this] { emit ImportNANDBackup(); });
m_check_nand = AddAction(tools_menu, tr("Check NAND..."), this, &MenuBar::CheckNAND); m_check_nand = AddAction(tools_menu, tr("Check NAND..."), this, &MenuBar::CheckNAND);
m_extract_certificates = AddAction(tools_menu, tr("Extract Certificates from NAND"), this, m_extract_certificates = AddAction(tools_menu, tr("Extract Certificates from NAND"), this,