fix hang at initializing xschedule if remote falcon server is not ava…

…ilable
xLightsSequencer · Dec 31, 2024 · f9f0982 · f9f0982
1 parent 81f936e
commit f9f0982
Showing 1 changed file with 14 additions and 24 deletions.
diff --git a/xSchedule/RemoteFalcon/RemoteFalconMain.cpp b/xSchedule/RemoteFalcon/RemoteFalconMain.cpp
@@ -262,33 +262,23 @@ RemoteFalconFrame::RemoteFalconFrame(wxWindow* parent, const std::string& showDi
 
     if (_options.GetClearQueueOnStart()) {
         AddMessage(MESSAGE_LEVEL::ML_INFO, "Clearing remote falcon list of songs.");
-        int tries = 10;
-        bool done = false;
-        do {
-            auto res = _remoteFalcon->PurgeQueue();
-            AddMessage(MESSAGE_LEVEL::ML_INFO, "    " + res);
-
-            wxJSONReader reader;
-            wxJSONValue val;
-            reader.Parse(res, &val);
-
-            if (!val.IsNull()) {
-                if (val["message"].AsString() == "Success") {
-                    done = true;
-                }
-                else if (val["message"].AsString() == "Unauthorized") {
-                    tries = 1;
-                    AddMessage(MESSAGE_LEVEL::ML_ERROR, "Error: " + val["message"].AsString());
-                }
-            }
-            tries--;
-        } while (!done && tries > 0);
 
-        if (tries == 0) {
-            logger_base.warn("RemoteFalcon failed to clear existing list of songs.");
+        auto res = _remoteFalcon->PurgeQueue();
+
+        wxJSONReader reader;
+        wxJSONValue val;
+        reader.Parse(res, &val);
+
+        if (!val.IsNull()) {
+            if (val["message"].AsString() == "Success") {
+                AddMessage(MESSAGE_LEVEL::ML_INFO, "Cleared remote falcon list of songs.");
+            } else {
+                AddMessage(MESSAGE_LEVEL::ML_ERROR, "Error: " + val["message"].AsString());
+            }
+        } else {
+            AddMessage(MESSAGE_LEVEL::ML_ERROR, "Error: " + val["message"].AsString());
         }
     }
-
     ValidateWindow();
 }