From 95c3f1c09838ef122345b10e14828106710e03c4 Mon Sep 17 00:00:00 2001 From: Thomas Guillemard Date: Sat, 7 Sep 2019 15:39:06 +0200 Subject: [PATCH] ui: Fix segfault on Linux when passing a program via command line --- Ryujinx/Program.cs | 5 +++++ Ryujinx/Ui/MainWindow.cs | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs index 5663a5d5bd..94cbd80d50 100644 --- a/Ryujinx/Program.cs +++ b/Ryujinx/Program.cs @@ -30,6 +30,11 @@ namespace Ryujinx gtkApplication.AddWindow(mainWindow); mainWindow.Show(); + if (args.Length == 1) + { + mainWindow.LoadApplication(args[0]); + } + Application.Run(); } diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs index 8a38f7c1df..59ce50923f 100644 --- a/Ryujinx/Ui/MainWindow.cs +++ b/Ryujinx/Ui/MainWindow.cs @@ -131,8 +131,6 @@ namespace Ryujinx.UI UpdateGameTable(); // Temporary code section end - - LoadApplication(args[0]); } else { @@ -202,7 +200,7 @@ namespace Ryujinx.UI StyleContext.AddProviderForScreen(Gdk.Screen.Default, cssProvider, 800); } - private void LoadApplication(string path) + internal void LoadApplication(string path) { if (_gameLoaded) {