tidus4400/rjx-mirror
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

Fix some GLXBadDrawable crashes on linux (#1900)

Browse source 
Fixes the crashes on linux when you stop emulation, and when you try to
exit the emulator while a game is running.
Also tested on windows without problems on my side.
This commit is contained in:
Sera 2021-01-19 03:31:59 +01:00 committed by GitHub
parent 734747ae58
commit 2fe3b8e58c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Ryujinx/Ui/MainWindow.cs
View file

@ -593,7 +593,6 @@ namespace Ryujinx.Ui
ToggleExtraWidgets(true); ToggleExtraWidgets(true);
} }
_viewBox.Remove(GlRendererWidget);
GlRendererWidget.Exit(); GlRendererWidget.Exit();
if(GlRendererWidget.Window != Window && GlRendererWidget.Window != null) if(GlRendererWidget.Window != Window && GlRendererWidget.Window != null)
@ -606,6 +605,7 @@ namespace Ryujinx.Ui
_windowsMultimediaTimerResolution?.Dispose(); _windowsMultimediaTimerResolution?.Dispose();
_windowsMultimediaTimerResolution = null; _windowsMultimediaTimerResolution = null;
_viewBox.Remove(GlRendererWidget);
_viewBox.Add(_gameTableWindow); _viewBox.Add(_gameTableWindow);
_gameTableWindow.Expand = true; _gameTableWindow.Expand = true;
@ -713,6 +713,7 @@ namespace Ryujinx.Ui
// Wait for the other thread to dispose the HLE context before exiting. // Wait for the other thread to dispose the HLE context before exiting.
_deviceExitStatus.WaitOne(); _deviceExitStatus.WaitOne();
GlRendererWidget.Dispose();
} }
} }
@ -1202,4 +1203,4 @@ namespace Ryujinx.Ui
UpdateGameTable(); UpdateGameTable();
} }
} }
} }