From 5088ff40e988bc240efadd5dbbfcf7d51b99ba7e Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Thu, 18 Mar 2021 21:11:52 -0700
Subject: [PATCH] Fix 1-frame text glitch when returning to editor settings
 from options

The returnmenu() needs to be deferred until the end of the frame.
---
 desktop_version/src/Game.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 2af98304..951f8109 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -6624,6 +6624,14 @@ static void returntoingametemp(void)
     game.returntomenu(game.kludge_ingametemp);
 }
 
+#if !defined(NO_CUSTOM_LEVELS) && !defined(NO_EDITOR)
+static void returntoedsettings(void)
+{
+    extern Game game;
+    game.returntomenu(Menu::ed_settings);
+}
+#endif
+
 void Game::returntoingame(void)
 {
     ingame_titlemode = false;
@@ -6632,7 +6640,7 @@ void Game::returntoingame(void)
     if (ingame_editormode)
     {
         ingame_editormode = false;
-        returntomenu(Menu::ed_settings);
+        DEFER_CALLBACK(returntoedsettings);
         gamestate = EDITORMODE;
         ed.settingskey = true;
     }