mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed bug that allowed a user to attempt to load multiple games at a time which causes a crash

Browse source
This commit is contained in:
Xpl0itR 2019-06-30 23:01:44 +01:00
commit e1ba904108
No known key found for this signature in database
GPG key ID: 91798184109676AD
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Ryujinx/GUI/MainWindow.cs
View file

@ -32,6 +32,8 @@ namespace Ryujinx
private static ListStore _TableStore; private static ListStore _TableStore;
private static bool _GameLoaded = false;
#pragma warning disable 649 #pragma warning disable 649
[GUI] Window MainWin; [GUI] Window MainWin;
[GUI] CheckMenuItem FullScreen; [GUI] CheckMenuItem FullScreen;
@ -90,8 +92,6 @@ namespace Ryujinx
//Box.Remove(GameTableWindow); //Box.Remove(GameTableWindow);
LoadApplication(args[0]); LoadApplication(args[0]);
new Thread(new ThreadStart(CreateGameWindow)).Start();
} }
else else
{ {
@ -155,7 +155,18 @@ namespace Ryujinx
private static void LoadApplication(string path) private static void LoadApplication(string path)
{ {
if (Directory.Exists(path)) if (_GameLoaded)
{
MessageDialog eRrOr = new MessageDialog(null, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, "A game has already been loaded, please close the game and try again");
eRrOr.SetSizeRequest(100, 20);
eRrOr.Title = "Ryujinx - Error";
eRrOr.Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.GUI.assets.ryujinxIcon.png");
eRrOr.WindowPosition = WindowPosition.Center;
eRrOr.Run();
eRrOr.Destroy();
}
else if (Directory.Exists(path))
{ {
string[] romFsFiles = Directory.GetFiles(path, "*.istorage"); string[] romFsFiles = Directory.GetFiles(path, "*.istorage");
@ -174,7 +185,12 @@ namespace Ryujinx
Logger.PrintInfo(LogClass.Application, "Loading as cart WITHOUT RomFS."); Logger.PrintInfo(LogClass.Application, "Loading as cart WITHOUT RomFS.");
_device.LoadCart(path); _device.LoadCart(path);
} }
new Thread(new ThreadStart(CreateGameWindow)).Start();
_GameLoaded = true;
} }
else if (File.Exists(path)) else if (File.Exists(path))
{ {
switch (System.IO.Path.GetExtension(path).ToLowerInvariant()) switch (System.IO.Path.GetExtension(path).ToLowerInvariant())
@ -197,6 +213,10 @@ namespace Ryujinx
_device.LoadProgram(path); _device.LoadProgram(path);
break; break;
} }
new Thread(new ThreadStart(CreateGameWindow)).Start();
_GameLoaded = true;
} }
else else
{ {
@ -221,7 +241,7 @@ namespace Ryujinx
} }
} }
private void CreateGameWindow() private static void CreateGameWindow()
{ {
using (GlScreen screen = new GlScreen(_device, _renderer)) using (GlScreen screen = new GlScreen(_device, _renderer))
{ {
@ -232,8 +252,6 @@ namespace Ryujinx
_device.Dispose(); _device.Dispose();
_audioOut.Dispose(); _audioOut.Dispose();
Logger.Shutdown();
} }
} }
@ -247,8 +265,6 @@ namespace Ryujinx
//Box.Remove(GameTableWindow); //Box.Remove(GameTableWindow);
//Box.Add(GlScreen); //Box.Add(GlScreen);
new Thread(new ThreadStart(CreateGameWindow)).Start();
} }
private void Load_Application_File(object o, EventArgs args) private void Load_Application_File(object o, EventArgs args)
@ -267,8 +283,6 @@ namespace Ryujinx
//Box.Remove(GameTableWindow); //Box.Remove(GameTableWindow);
//Box.Add(GlScreen); //Box.Add(GlScreen);
new Thread(new ThreadStart(CreateGameWindow)).Start();
} }
fc.Destroy(); fc.Destroy();
@ -284,8 +298,6 @@ namespace Ryujinx
//Box.Remove(GameTableWindow); //Box.Remove(GameTableWindow);
//Box.Add(GlScreen); //Box.Add(GlScreen);
new Thread(new ThreadStart(CreateGameWindow)).Start();
} }
fc.Destroy(); fc.Destroy();