From d741b3aa27d9288cc1dc61eb5f6d72c97f90fce3 Mon Sep 17 00:00:00 2001
From: Dav999 <dav999.tolp@gmail.com>
Date: Thu, 14 Sep 2023 03:52:04 +0200
Subject: [PATCH] Fix double return when pressing Esc in editor font menu

The line that checked if the current menu is the font menu ended up
below the code that returned a menu, so this was an easy fix.

Closes #1017.
---
 desktop_version/src/Editor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp
index d5a1a8e1..12713c08 100644
--- a/desktop_version/src/Editor.cpp
+++ b/desktop_version/src/Editor.cpp
@@ -3509,11 +3509,11 @@ void editorinput(void)
                 }
                 else
                 {
-                    game.returnmenu();
-                    map.nexttowercolour();
-
                     // Avoid double return
                     esc_from_font = game.currentmenuname == Menu::ed_font;
+
+                    game.returnmenu();
+                    map.nexttowercolour();
                 }
 
                 if (ed.state == EditorState_MENU && !esc_from_font)