diff options
| author | Ac_K <Acoustik666@gmail.com> | 2022-11-24 15:08:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-24 15:08:27 +0100 |
| commit | a1ddaa2736b188de928564af56aa787a25831ff7 (patch) | |
| tree | 1a4bb2717d61b3d6106103f29dbc461190e53e7b /Ryujinx.Graphics.OpenGL/Window.cs | |
| parent | 008286b79fd7a5d223ccd7bd99c86d8058e216e1 (diff) | |
ui: Fixes disposing on GTK/Avalonia and Firmware Messages on Avalonia (#3885)1.1.380
* ui: Only wait on _exitEvent when MainLoop is active under GTK
This fixes a dispose issue under Horizon/GTK, we don't check if the ApplicationClient is null so it throw NCE. We don't check if the main loop is active and waiting an event which is set in the main loop... So that could lead to a freeze.
Everything works fine in GTK now.
Related issue: https://github.com/Ryujinx/Ryujinx/issues/3873
As a side note, same kind of issue appear in Avalonia UI too. Firmware's popup doesn't show anything and the emulator just freeze.
* TSRBerry's change
Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
* Fix Avalonia crashing/freezing
* Add Avalonia OpenGL fixes
* Fix firmware popup on windows
* Fixes everything
* Add _initialized bool to VulkanRenderer and OpenGL Window
Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Diffstat (limited to 'Ryujinx.Graphics.OpenGL/Window.cs')
| -rw-r--r-- | Ryujinx.Graphics.OpenGL/Window.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Ryujinx.Graphics.OpenGL/Window.cs b/Ryujinx.Graphics.OpenGL/Window.cs index 61b739b1..8f7917f9 100644 --- a/Ryujinx.Graphics.OpenGL/Window.cs +++ b/Ryujinx.Graphics.OpenGL/Window.cs @@ -10,6 +10,8 @@ namespace Ryujinx.Graphics.OpenGL private const int TextureCount = 3; private readonly OpenGLRenderer _renderer; + private bool _initialized; + private int _width; private int _height; private int _copyFramebufferHandle; @@ -179,6 +181,7 @@ namespace Ryujinx.Graphics.OpenGL public void InitializeBackgroundContext(IOpenGLContext baseContext) { BackgroundContext = new BackgroundContextWorker(baseContext); + _initialized = true; } public void CaptureFrame(int x, int y, int width, int height, bool isBgra, bool flipX, bool flipY) @@ -193,6 +196,11 @@ namespace Ryujinx.Graphics.OpenGL public void Dispose() { + if (!_initialized) + { + return; + } + BackgroundContext.Dispose(); if (_copyFramebufferHandle != 0) @@ -203,4 +211,4 @@ namespace Ryujinx.Graphics.OpenGL } } } -} +}
\ No newline at end of file |