summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-11-06 01:17:16 +0100
committerbunnei <bunneidev@gmail.com>2014-11-06 01:17:16 +0100
commit1aa29b2b6cae4bde3a5de22a06a9078934235778 (patch)
tree2b659ef13806ebffc42d4e554015b321979564ff
parentMerge pull request #182 from SeannyM/fix-compile (diff)
parentQt: Auto-start game when selected, play game that's passed via argv[1]. (diff)
downloadyuzu-1aa29b2b6cae4bde3a5de22a06a9078934235778.tar
yuzu-1aa29b2b6cae4bde3a5de22a06a9078934235778.tar.gz
yuzu-1aa29b2b6cae4bde3a5de22a06a9078934235778.tar.bz2
yuzu-1aa29b2b6cae4bde3a5de22a06a9078934235778.tar.lz
yuzu-1aa29b2b6cae4bde3a5de22a06a9078934235778.tar.xz
yuzu-1aa29b2b6cae4bde3a5de22a06a9078934235778.tar.zst
yuzu-1aa29b2b6cae4bde3a5de22a06a9078934235778.zip
-rw-r--r--src/citra_qt/main.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 153712273..304c169b9 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -116,7 +116,10 @@ GMainWindow::GMainWindow()
show();
- System::Init(render_window);
+ QStringList args = QApplication::arguments();
+ if (args.length() >= 2) {
+ BootGame(args[1].toStdString());
+ }
}
GMainWindow::~GMainWindow()
@@ -129,6 +132,7 @@ GMainWindow::~GMainWindow()
void GMainWindow::BootGame(std::string filename)
{
NOTICE_LOG(MASTER_LOG, "Citra starting...\n");
+ System::Init(render_window);
if (Core::Init()) {
ERROR_LOG(MASTER_LOG, "Core initialization failed, exiting...");
@@ -149,6 +153,7 @@ void GMainWindow::BootGame(std::string filename)
render_window->GetEmuThread().start();
render_window->show();
+ OnStartGame();
}
void GMainWindow::OnMenuLoadFile()
@@ -185,6 +190,7 @@ void GMainWindow::OnPauseGame()
void GMainWindow::OnStopGame()
{
render_window->GetEmuThread().SetCpuRunning(false);
+ // TODO: Shutdown core
ui.action_Start->setEnabled(true);
ui.action_Pause->setEnabled(false);
@@ -246,7 +252,6 @@ int __cdecl main(int argc, char* argv[])
QApplication::setAttribute(Qt::AA_X11InitThreads);
QApplication app(argc, argv);
GMainWindow main_window;
-
main_window.show();
return app.exec();
}