From d6b64f6b0903c94d1266930e24aba210bef7e606 Mon Sep 17 00:00:00 2001
From: zhupengfei <zhupf321@gmail.com>
Date: Thu, 23 Jul 2020 14:10:16 +0800
Subject: [PATCH] citra_qt: Simplify movie recording code

The behavior shouldn't be changed.
---
 src/citra_qt/main.cpp | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 6e9b9d553..aee6de481 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -1074,6 +1074,14 @@ void GMainWindow::BootGame(const QString& filename) {
         ShowFullscreen();
     }
 
+    if (movie_record_on_start) {
+        Core::Movie::GetInstance().StartRecording(movie_record_path.toStdString(),
+                                                  movie_record_author.toStdString());
+        movie_record_on_start = false;
+        movie_record_path.clear();
+        movie_record_author.clear();
+    }
+
     if (video_dumping_on_start) {
         Layout::FramebufferLayout layout{
             Layout::FrameLayoutFromResolutionScale(VideoCore::GetResolutionScaleFactor())};
@@ -1540,14 +1548,6 @@ void GMainWindow::OnMenuRecentFile() {
 void GMainWindow::OnStartGame() {
     Camera::QtMultimediaCameraHandler::ResumeCameras();
 
-    if (movie_record_on_start) {
-        Core::Movie::GetInstance().StartRecording(movie_record_path.toStdString(),
-                                                  movie_record_author.toStdString());
-        movie_record_on_start = false;
-        movie_record_path.clear();
-        movie_record_author.clear();
-    }
-
     PreventOSSleep();
 
     emu_thread->SetRunning(true);
@@ -1853,15 +1853,12 @@ void GMainWindow::OnRecordMovie() {
         return;
     }
 
-    if (emulation_running) {
-        // Restart game
+    movie_record_on_start = true;
+    movie_record_path = dialog.GetPath();
+    movie_record_author = dialog.GetAuthor();
+
+    if (emulation_running) { // Restart game
         BootGame(QString(game_path));
-        Core::Movie::GetInstance().StartRecording(dialog.GetPath().toStdString(),
-                                                  dialog.GetAuthor().toStdString());
-    } else {
-        movie_record_on_start = true;
-        movie_record_path = dialog.GetPath();
-        movie_record_author = dialog.GetAuthor();
     }
     ui->action_Close_Movie->setEnabled(true);
 }