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

@@ -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)