From bccfb6cd983a62ebbbe1ad0ac65ff86749520266 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Wed, 6 Jan 2021 14:40:31 -0700
Subject: [PATCH] ui: Fix fullscreen launch

---
 ui/xemu.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ui/xemu.c b/ui/xemu.c
index 96e12f1df1..308182a500 100644
--- a/ui/xemu.c
+++ b/ui/xemu.c
@@ -356,9 +356,10 @@ static void sdl_send_mouse_event(struct sdl2_console *scon, int dx, int dy,
     qemu_input_event_sync();
 }
 
-static void toggle_full_screen(struct sdl2_console *scon)
+static void set_full_screen(struct sdl2_console *scon, bool set)
 {
-    gui_fullscreen = !gui_fullscreen;
+    gui_fullscreen = set;
+
     if (gui_fullscreen) {
         SDL_SetWindowFullscreen(scon->real_window,
                                 SDL_WINDOW_FULLSCREEN_DESKTOP);
@@ -378,6 +379,11 @@ static void toggle_full_screen(struct sdl2_console *scon)
 #endif
 }
 
+static void toggle_full_screen(struct sdl2_console *scon)
+{
+    set_full_screen(scon, !gui_fullscreen);
+}
+
 static int get_mod_state(void)
 {
     SDL_Keymod mod = SDL_GetModState();
@@ -931,9 +937,13 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
 #endif
     }
 
+    sdl2_console[0].real_window = m_window;
+    sdl2_console[0].winctx = m_context;
+
     gui_grab = 0;
     if (gui_fullscreen) {
         sdl_grab_start(0);
+        set_full_screen(&sdl2_console[0], gui_fullscreen);
     }
 
     mouse_mode_notifier.notify = sdl_mouse_mode_change;