fixed bug with copying bitmaps when remapping 'global.door' graphics

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index 85859907ce83431874cabff2ab6c03f393dcab02..1b72d69b4a9514921e37e88a2f21d25e06a825ee 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -11991,11 +11991,12 @@ void HandleLevelEditorKeyInput(Key key)
       ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
     else if (letter == 'U')
       ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
-    else if (key == KSYM_KP_Subtract || letter == '-')
+    else if (letter == '-' || key == KSYM_KP_Subtract)
       ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 3);
-    else if (key == KSYM_KP_0 || letter == '0')
+    else if (letter == '0' || key == KSYM_KP_0)
       ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
-    else if (key == KSYM_KP_Add)
+    else if (letter == '+' || key == KSYM_KP_Add ||
+            letter == '=')     // ("Shift-=" is "+" on US keyboards)
       ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
     else if (key == KSYM_Return ||
             key == KSYM_space ||
@@ -12050,7 +12051,7 @@ void PrintEditorGadgetInfoText(struct GadgetInfo *gi)
   char shortcut[MAX_OUTPUT_LINESIZE + 1];
   int max_infotext_len = getMaxInfoTextLength();
 
-  if (gi == NULL || gi->info_text == NULL)
+  if (gi == NULL || strlen(gi->info_text) == 0)
     return;
 
   strncpy(infotext, gi->info_text, max_infotext_len);