From 7b6ee8a4533455fe8c62149f127117d28608a068 Mon Sep 17 00:00:00 2001
From: Areloch <Areloch@gmail.com>
Date: Thu, 3 Dec 2020 19:58:51 -0600
Subject: [PATCH] Adds handling so the pause menu has a button to exit the
 editor as a quick shortcut

---
 .../BaseGame/game/data/ui/guis/pauseMenu.cs    | 18 +++++++++++-------
 Templates/BaseGame/game/tools/main.cs          |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Templates/BaseGame/game/data/ui/guis/pauseMenu.cs b/Templates/BaseGame/game/data/ui/guis/pauseMenu.cs
index 887136ca5..8d23b95d2 100644
--- a/Templates/BaseGame/game/data/ui/guis/pauseMenu.cs
+++ b/Templates/BaseGame/game/data/ui/guis/pauseMenu.cs
@@ -1,10 +1,3 @@
-function PauseMenuList::onAdd(%this)
-{
-   %this.addRow("Options", "openPauseMenuOptions", -1, -30);
-   %this.addRow("Exit to Menu", "pauseMenuExitToMenu", -1, -30);
-   %this.addRow("Exit to Desktop", "pauseMenuExitToDesktop", -1, -30);  
-}
-
 function PauseMenu::onWake(%this)
 {
    if($Server::ServerType $= "SinglePlayer")
@@ -17,6 +10,17 @@ function PauseMenu::onWake(%this)
    PauseMenuList.hidden = false;
    PauseMenuList.setFirstResponder();
    PauseButtonHolder.setActive();
+   
+   PauseMenuList.clearRows();
+   
+   if($Tools::loaded && EditorIsActive())
+   {
+      PauseMenuList.addRow("Exit Editor", "fastLoadWorldEdit", -1, -30); 
+   }
+   
+   PauseMenuList.addRow("Options", "openPauseMenuOptions", -1, -30);
+   PauseMenuList.addRow("Exit to Menu", "pauseMenuExitToMenu", -1, -30);
+   PauseMenuList.addRow("Exit to Desktop", "pauseMenuExitToDesktop", -1, -30); 
 }
 
 
diff --git a/Templates/BaseGame/game/tools/main.cs b/Templates/BaseGame/game/tools/main.cs
index 9bb9aa7fa..8c5f31296 100644
--- a/Templates/BaseGame/game/tools/main.cs
+++ b/Templates/BaseGame/game/tools/main.cs
@@ -257,7 +257,7 @@ function EditorCreateFakeGameSession(%fileName)
 
 function fastLoadWorldEdit(%val)
 {
-   if(%val)
+   if(%val || %val $= "")
    {
       if(!$Tools::loaded)
       {