X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=dab2b131f2ec6f36bca201f1b773f1a7f3b176ab;hb=4f61e86f982fc044d2a99477be188374ec763275;hp=cd59331de9317a368a28ba3e51d4e91b253195f8;hpb=55dd4483014c06b210611c6d00f8fee6db39150b;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index cd59331d..dab2b131 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4074,7 +4074,7 @@ static void HandleTypeNameExt(boolean initialize, Key key)
   }
   else
   {
-    SetGameStatus(GAME_MODE_MAIN);
+    SetGameStatus(game_status_last_screen);
 
     pos->width = strlen(name) * font_width;
     sx = mSX + ALIGNED_TEXT_XPOS(pos);
@@ -4182,8 +4182,8 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
 
   OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
-  HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
   MapScreenTreeGadgets(*ti_ptr);
+  HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
 
   DrawMaskedBorder(fade_mask);