Fix recursive lock. Fix platform bot flying on SBB.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp

@@ -144,9 +144,12 @@ void SysbotBaseNetwork_Connection::thread_body_internal(){
     m_socket->connect(
         m_socket, &QTcpSocket::disconnected,
         m_socket, [this]{
-            m_ready.store(false, std::memory_order_release);
-            m_stopping.store(true, std::memory_order_release);
-            m_cv.notify_all();
+            {
+                std::unique_lock<std::mutex> lg(m_lock);
+                m_ready.store(false, std::memory_order_release);
+                m_stopping.store(true, std::memory_order_release);
+                m_cv.notify_all();
+            }
             set_status(html_color_text("Disconnected by host.", COLOR_RED));
         }
     );

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.cpp

@@ -76,27 +76,31 @@ ProController_SysbotBase::~ProController_SysbotBase(){
 
 void ProController_SysbotBase::wait_for_all(const Cancellable* cancellable){
 //    cout << "ProController_SysbotBase::wait_for_all()" << endl;
-    std::unique_lock<std::mutex> lg(m_lock);
     issue_barrier(cancellable);
+    std::unique_lock<std::mutex> lg(m_lock);
     m_cv.wait(lg, [this]{
         return m_command_queue.empty() || m_replace_on_next.load(std::memory_order_relaxed);
     });
 }
 void ProController_SysbotBase::cancel_all_commands(){
 //    cout << "ProController_SysbotBase::cancel_all_commands()" << endl;
-    std::lock_guard<std::mutex> lg(m_lock);
-    if (!m_command_queue.empty()){
-        m_command_queue.clear();
-        m_is_active = false;
-        m_cv.notify_all();
+    {
+        std::lock_guard<std::mutex> lg(m_lock);
+        if (!m_command_queue.empty()){
+            m_command_queue.clear();
+            m_is_active = false;
+            m_cv.notify_all();
+        }
     }
     this->clear_on_next();
 }
 void ProController_SysbotBase::replace_on_next_command(){
 //    cout << "ProController_SysbotBase::replace_on_next_command()" << endl;
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_cv.notify_all();
-    m_replace_on_next.store(true, std::memory_order_relaxed);
+    {
+        std::lock_guard<std::mutex> lg(m_lock);
+        m_cv.notify_all();
+        m_replace_on_next.store(true, std::memory_order_relaxed);
+    }
     this->clear_on_next();
 }
 

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp

@@ -69,6 +69,11 @@ void SingleSwitchProgramSession::run_program_instance(SingleSwitchProgramEnviron
 
     m_scope.store(&scope, std::memory_order_release);
 
+#if 0
+    ProControllerContext context(scope, env.console.controller());
+    m_option.instance().program(env, context);
+    context.wait_for_all_requests();
+#else
     try{
         ProControllerContext context(scope, env.console.controller());
         m_option.instance().program(env, context);
@@ -77,6 +82,7 @@ void SingleSwitchProgramSession::run_program_instance(SingleSwitchProgramEnviron
         m_scope.store(nullptr, std::memory_order_release);
         throw;
     }
+#endif
     m_scope.store(nullptr, std::memory_order_release);
 }
 void SingleSwitchProgramSession::internal_stop_program(){
@@ -157,7 +163,9 @@ void SingleSwitchProgramSession::internal_run_program(){
             env, m_option.instance().NOTIFICATION_ERROR_FATAL,
             message
         );
-    }catch (std::exception& e){
+    }
+#if 1
+    catch (std::exception& e){
         logger().log("Program stopped with an exception!", COLOR_RED);
         std::string message = e.what();
         if (message.empty()){
@@ -176,6 +184,7 @@ void SingleSwitchProgramSession::internal_run_program(){
             "Unknown error."
         );
     }
+#endif
 }
 
 

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp

@@ -20,7 +20,7 @@ TurboMacro_Descriptor::TurboMacro_Descriptor()
         "Create macros",
         FeedbackType::NONE,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController}
     )
 {}
 

SerialPrograms/Source/PokemonSV/Programs/PokemonSV_AreaZero.cpp

@@ -186,7 +186,7 @@ void return_to_outside_zero_gate(
     VideoStream& stream, ProControllerContext& context
 ){
     open_map_from_overworld(info, stream, context);
-    pbf_move_left_joystick(context, 0, 0, 5, 50);
+    pbf_move_left_joystick(context, 96, 96, 5, 50);
     fly_to_overworld_from_map(info, stream, context);
 }
 void return_to_inside_zero_gate(