commit b3a654d82ecf276b59a67b2fd688e11a0d8a0064
author Marc-André Lureau <marcandre.lureau@redhat.com> Thu May 11 11:42:17 2023 +0400
committer Marc-André Lureau <marcandre.lureau@redhat.com> Sun May 28 13:08:25 2023 +0400
tree 12c7287226176e815ac2b79a8f47f2b33f4bea29
parent f8a951bb951140a585341c700ebeec58d83f7bbc

ui/sdl2: fix surface_gl_update_texture: Assertion 'gls' failed

Before sdl2_gl_update() is called, sdl2_gl_switch() may decide to
destroy the console window and its associated shaders.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1644
Fixes: c84ab0a500a8 ("ui/console: optionally update after gfx switch")

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Bin Meng <bin.meng@windriver.com>
Message-Id: <20230511074217.4171842-1-marcandre.lureau@redhat.com>

ui/sdl2-gl.c

diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c
index 39cab8c..bbfa70e 100644
--- a/ui/sdl2-gl.c
+++ b/ui/sdl2-gl.c
@@ -67,6 +67,10 @@
 
     assert(scon->opengl);
 
+    if (!scon->real_window) {
+        return;
+    }
+
     SDL_GL_MakeCurrent(scon->real_window, scon->winctx);
     surface_gl_update_texture(scon->gls, scon->surface, x, y, w, h);
     scon->updates++;