From 091edcebb4492eb8f666ee561661f4b46026c0c9 Mon Sep 17 00:00:00 2001
From: mpnico <mpnico@gmail.com>
Date: Tue, 6 Jul 2021 20:04:21 +0200
Subject: [PATCH] Command line argument -f doesn't toggle 'Start games in
 fullscreen mode' (#2424)

Closes Ryujinx#2308
---
 Ryujinx/Program.cs       | 7 +------
 Ryujinx/Ui/MainWindow.cs | 8 ++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs
index fbdea7de6..846275cd8 100644
--- a/Ryujinx/Program.cs
+++ b/Ryujinx/Program.cs
@@ -136,11 +136,6 @@ namespace Ryujinx
                 }
             }
 
-            if (startFullscreenArg)
-            {
-                ConfigurationState.Instance.Ui.StartFullscreen.Value = true;
-            }
-
             // Logging system information.
             PrintSystemInfo();
 
@@ -164,7 +159,7 @@ namespace Ryujinx
 
             if (launchPathArg != null)
             {
-                mainWindow.LoadApplication(launchPathArg);
+                mainWindow.LoadApplication(launchPathArg, startFullscreenArg);
             }
 
             if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false))
diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs
index eb1e10b3a..c7d86c7e6 100644
--- a/Ryujinx/Ui/MainWindow.cs
+++ b/Ryujinx/Ui/MainWindow.cs
@@ -562,7 +562,7 @@ namespace Ryujinx.Ui
             }
         }
 
-        public void LoadApplication(string path)
+        public void LoadApplication(string path, bool startFullscreen = false)
         {
             if (_gameLoaded)
             {
@@ -576,7 +576,7 @@ namespace Ryujinx.Ui
 
                 RendererWidget = CreateRendererWidget();
 
-                SwitchToRenderWidget();
+                SwitchToRenderWidget(startFullscreen);
 
                 InitializeSwitchInstance();
 
@@ -769,7 +769,7 @@ namespace Ryujinx.Ui
             }
         }
 
-        private void SwitchToRenderWidget()
+        private void SwitchToRenderWidget(bool startFullscreen = false)
         {
             _viewBox.Remove(_gameTableWindow);
             RendererWidget.Expand = true;
@@ -782,7 +782,7 @@ namespace Ryujinx.Ui
             {
                 ToggleExtraWidgets(false);
             }
-            else if (ConfigurationState.Instance.Ui.StartFullscreen.Value)
+            else if (startFullscreen || ConfigurationState.Instance.Ui.StartFullscreen.Value)
             {
                 FullScreen_Toggled(null, null);
             }