aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Guillemard <me@thog.eu>2019-09-08 03:59:41 +0200
committerjduncanator <1518948+jduncanator@users.noreply.github.com>2019-09-08 11:59:41 +1000
commit9afb8ad485b364e3ecf738b1175c32cce95507bd (patch)
treeedab74a84674690afb0782ac6c0be9fb68925f7c
parent7ff394e68ae0f80f02530a5947e365f42fc5c910 (diff)
ui: Fix segfault on Linux when passing a program via command line (#764)
-rw-r--r--Ryujinx/Program.cs5
-rw-r--r--Ryujinx/Ui/MainWindow.cs4
2 files changed, 6 insertions, 3 deletions
diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs
index 5663a5d5..94cbd80d 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 8a38f7c1..59ce5092 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)
{