Fix another deadlock.

Author: Mysticial

Common/Cpp/CancellableScope.cpp

@@ -39,6 +39,9 @@ void Cancellable::add_cancel_listener(CancelListener& listener){
 void Cancellable::remove_cancel_listener(CancelListener& listener){
     m_impl->m_listeners.remove(listener);
 }
+bool Cancellable::try_add_cancel_listener(CancelListener& listener){
+    return m_impl->m_listeners.try_add(listener);
+}
 
 
 Cancellable::Cancellable()

Common/Cpp/CancellableScope.h

@@ -52,6 +52,8 @@ class Cancellable{
     void add_cancel_listener(CancelListener& listener);
     void remove_cancel_listener(CancelListener& listener);
 
+    bool try_add_cancel_listener(CancelListener& listener);
+
 
 public:
     virtual ~Cancellable();

SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBase.cpp

@@ -952,11 +952,26 @@ BotBaseMessage PABotBase::wait_for_request(uint64_t seqnum, Cancellable* cancell
                 return ret;
             }
         }
+        cv_wait(cancelled, lg);
+    }
+}
+
+
+void PABotBase::cv_wait(Cancellable* cancellable, std::unique_lock<std::mutex>& lg){
+    if (cancellable == nullptr){
         m_cv.wait(lg);
+        return;
+    }
+
+    //  Only wait if we're able to attach the cancel listener.
+    if (cancellable->try_add_cancel_listener(*this)){
+        m_cv.wait(lg);
+        cancellable->remove_cancel_listener(*this);
     }
 }
 
 
 
 
+
 }

SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBase.h

@@ -176,15 +176,7 @@ class PABotBase : public BotBaseController, private PABotBaseConnection{
     BotBaseMessage wait_for_request(uint64_t seqnum, Cancellable* cancelled = nullptr);
 
     //  Make we get notified of a cancellable cancels so we can wake up.
-    void cv_wait(Cancellable* cancellable, std::unique_lock<std::mutex>& lg){
-        if (cancellable){
-            cancellable->add_cancel_listener(*this);
-        }
-        m_cv.wait(lg);
-        if (cancellable){
-            cancellable->remove_cancel_listener(*this);
-        }
-    }
+    void cv_wait(Cancellable* cancellable, std::unique_lock<std::mutex>& lg);
 
 private:
     Logger& m_logger;

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp

@@ -138,9 +138,17 @@ std::string json_to_cpp(const JsonArray& history){
     ControllerState state;
     for (const JsonValue& command : history){
         const JsonObject& snapshot = command.to_object_throw();
-        Milliseconds duration(snapshot.get_integer_throw("duration_in_ms"));
+
+        uint64_t duration = 0;
+        bool ok = false;
+        ok |= snapshot.read_integer(duration, "duration_in_ms");
+        ok |= snapshot.read_integer(duration, "ms");
+        if (!ok){
+            throw JsonParseException("", "ms");
+        }
+
         state.load_json(snapshot);
-        ret += state.to_cpp(duration, Milliseconds(0));
+        ret += state.to_cpp(Milliseconds(duration), Milliseconds(0));
     }
     return ret;
 }
@@ -156,9 +164,17 @@ void execute_json_schedule(
     for (uint32_t i = 0; i < num_loops; i++){
         for (const JsonValue& command : history){
             const JsonObject& snapshot = command.to_object_throw();
-            Milliseconds duration(snapshot.get_integer_throw("duration_in_ms"));
+
+            uint64_t duration = 0;
+            bool ok = false;
+            ok |= snapshot.read_integer(duration, "duration_in_ms");
+            ok |= snapshot.read_integer(duration, "ms");
+            if (!ok){
+                throw JsonParseException("", "ms");
+            }
+
             state.load_json(snapshot);
-            state.execute(context, context.controller(), duration);
+            state.execute(context, context.controller(), Milliseconds(duration));
         }
         state.clear();
         state.execute(context, context.controller(), Seconds(seconds_wait_between_loops));