summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/MainWindow.cpp
diff options
context:
space:
mode:
authorLeo Lam <leolino.lam@gmail.com>2017-10-26 17:15:02 +0200
committerGitHub <noreply@github.com>2017-10-26 17:15:02 +0200
commitc4914fbb8b9d90e1acdd77ce7504a0e4c4dfd21f (patch)
treecbe6d36771633db3eab33dc8b6d643f3bc7440fb /Source/Core/DolphinQt2/MainWindow.cpp
parent5393575c552c733be0df89fddf2493ab7437b389 (diff)
parent4cc1bd972a12186b320d5e1142f10ab145df3203 (diff)
Merge pull request #6094 from leoetlino/drop-wad-hack
Drop the direct WAD launch hack
Diffstat (limited to 'Source/Core/DolphinQt2/MainWindow.cpp')
-rw-r--r--Source/Core/DolphinQt2/MainWindow.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
index fbb508f195..304327a4b7 100644
--- a/Source/Core/DolphinQt2/MainWindow.cpp
+++ b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -65,7 +65,7 @@
#include "UICommon/X11Utils.h"
#endif
-MainWindow::MainWindow() : QMainWindow(nullptr)
+MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters) : QMainWindow(nullptr)
{
setWindowTitle(QString::fromStdString(Common::scm_rev_str));
setWindowIcon(QIcon(Resources::GetMisc(Resources::LOGO_SMALL)));
@@ -84,6 +84,9 @@ MainWindow::MainWindow() : QMainWindow(nullptr)
InitCoreCallbacks();
NetPlayInit();
+
+ if (boot_parameters)
+ StartGame(std::move(boot_parameters));
}
MainWindow::~MainWindow()
@@ -652,8 +655,7 @@ void MainWindow::PerformOnlineUpdate(const std::string& region)
void MainWindow::BootWiiSystemMenu()
{
- StartGame(QString::fromStdString(
- Common::GetTitleContentPath(Titles::SYSTEM_MENU, Common::FROM_CONFIGURED_ROOT)));
+ StartGame(std::make_unique<BootParameters>(BootParameters::NANDTitle{Titles::SYSTEM_MENU}));
}
void MainWindow::NetPlayInit()