Fix deadlock.

Author: Mysticial

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp

@@ -253,17 +253,16 @@ void VideoSession::internal_set_resolution(Resolution resolution){
 }
 
 void VideoSession::run_commands(){
-    std::lock_guard<std::recursive_mutex> lg0(m_reset_lock);
-    if (m_recursion_depth != 0){
+    std::unique_lock<std::mutex> lg0(m_reset_lock, std::defer_lock);
+    if (!lg0.try_lock()){
         m_logger.log("Suppressing re-entrant command...", COLOR_RED);
         return;
     }
-    m_recursion_depth++;
     try{
         while (true){
             Command command;
             {
-                WriteSpinLock lg(m_queue_lock);
+                WriteSpinLock lg1(m_queue_lock);
 //                cout << "VideoSession::run_commands(): " << m_queued_commands.size() << endl;
                 if (m_queued_commands.empty()){
                     break;
@@ -286,9 +285,7 @@ void VideoSession::run_commands(){
                 break;
             }
         }
-        m_recursion_depth--;
     }catch (...){
-        m_recursion_depth--;
         throw;
     }
 }

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h

@@ -198,7 +198,7 @@ class VideoSession
 
 
 private:
-    mutable std::recursive_mutex m_reset_lock;
+    mutable std::mutex m_reset_lock;
     mutable SpinLock m_state_lock;
 //    bool m_shutting_down = false;
 
@@ -215,7 +215,6 @@ class VideoSession
     //  We need to queue up all reset commands and run them on the main thread.
     //  This is needed to prevent re-entrant calls from event processing.
     SpinLock m_queue_lock;
-    size_t m_recursion_depth = 0;
     std::deque<Command> m_queued_commands;
 
     ListenerSet<StateListener> m_state_listeners;