disable ConditionalCoreSuspender on Linux

until we can figure out why it doesn't behave properly
DFHack · Jan 10, 2025 · 20cd792 · 20cd792
1 parent e464afc
commit 20cd792
Showing 1 changed file with 29 additions and 0 deletions.
diff --git a/library/Core.cpp b/library/Core.cpp
@@ -419,13 +419,17 @@ bool is_builtin(color_ostream &con, const std::string &command) {
 }
 
 void get_commands(color_ostream &con, std::vector<std::string> &commands) {
+#ifdef LINUX_BUILD
+    CoreSuspender suspend;
+#else
     ConditionalCoreSuspender suspend{};
 
     if (!suspend) {
         con.printerr("Cannot acquire core lock in helpdb.get_commands\n");
         commands.clear();
         return;
     }
+#endif
 
     auto L = DFHack::Core::getInstance().getLuaState();
     Lua::StackUnwinder top(L);
@@ -626,12 +630,17 @@ static std::string sc_event_name (state_change_event id) {
 }
 
 void help_helper(color_ostream &con, const std::string &entry_name) {
+#ifdef LINUX_BUILD
+    CoreSuspender suspend;
+#else
     ConditionalCoreSuspender suspend{};
 
     if (!suspend) {
         con.printerr("Failed Lua call to helpdb.help (could not acquire core lock).\n");
         return;
     }
+#endif
+
     auto L = DFHack::Core::getInstance().getLuaState();
     Lua::StackUnwinder top(L);
 
@@ -649,7 +658,17 @@ void help_helper(color_ostream &con, const std::string &entry_name) {
 }
 
 void tags_helper(color_ostream &con, const std::string &tag) {
+#ifdef LINUX_BUILD
     CoreSuspender suspend;
+#else
+    ConditionalCoreSuspender suspend{};
+
+    if (!suspend) {
+        con.printerr("Failed Lua call to helpdb.help (could not acquire core lock).\n");
+        return;
+    }
+#endif
+
     auto L = DFHack::Core::getInstance().getLuaState();
     Lua::StackUnwinder top(L);
 
@@ -686,7 +705,17 @@ void ls_helper(color_ostream &con, const std::vector<std::string> &params) {
             filter.push_back(str);
     }
 
+#ifdef LINUX_BUILD
     CoreSuspender suspend;
+#else
+    ConditionalCoreSuspender suspend{};
+
+    if (!suspend) {
+        con.printerr("Failed Lua call to helpdb.help (could not acquire core lock).\n");
+        return;
+    }
+#endif
+
     auto L = DFHack::Core::getInstance().getLuaState();
     Lua::StackUnwinder top(L);