Merge pull request #5115 from myk002/myk_suspend_lineedit

don't auto-suspend the core for lineedit commands

Author: myk002

plugins/liquids.cpp

@@ -71,7 +71,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
         "liquids",
         "Place magma, water or obsidian.",
         df_liquids,
-        true)); // interactive, needs console for prompt
+        true, true)); // interactive, needs console for prompt
     commands.push_back(PluginCommand(
         "liquids-here",
         "Use settings from liquids at cursor position.",
@@ -368,6 +368,7 @@ command_result df_liquids (color_ostream &out_, vector <string> & parameters)
             cur_mode.amount = 7;
         else if(command.empty())
         {
+            CoreSuspender suspend;
             df_liquids_execute(out);
         }
         else

plugins/tiletypes.cpp

@@ -93,7 +93,7 @@ command_result df_tiletypes_here_point (color_ostream &out, vector <string> & pa
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     tiletypes_hist.load(HISTORY_FILE);
-    commands.push_back(PluginCommand("tiletypes", "Paints tiles of specified types onto the map.", df_tiletypes, true));
+    commands.push_back(PluginCommand("tiletypes", "Paints tiles of specified types onto the map.", df_tiletypes, true, true));
     commands.push_back(PluginCommand("tiletypes-command", "Run tiletypes commands (seperated by ' ; ')", df_tiletypes_command));
     commands.push_back(PluginCommand("tiletypes-here", "Repeat tiletypes command at cursor (with brush)", df_tiletypes_here));
     commands.push_back(PluginCommand("tiletypes-here-point", "Repeat tiletypes command at cursor (with single tile brush)", df_tiletypes_here_point));
@@ -1316,11 +1316,12 @@ command_result df_tiletypes (color_ostream &out_, vector <string> & parameters)
         commands.clear();
         Core::cheap_tokenise(input, commands);
 
-        command_result ret = processCommand(out, commands, 0, commands.size(), end, true);
-
-        if (ret != CR_OK)
         {
-            return ret;
+            CoreSuspender suspend;
+            command_result ret = processCommand(out, commands, 0, commands.size(), end, true);
+
+            if (ret != CR_OK)
+                return ret;
         }
     }
     return CR_OK;