Fix stop program responsiveness.

Author: Mysticial

SerialPrograms/Source/Controllers/Controller.h

@@ -185,11 +185,11 @@ class ControllerContext final : public CancellableScope{
     using ControllerType = Type;
 
 public:
-    ControllerContext(ControllerType& botbase)
-        : m_controller(botbase)
+    ControllerContext(ControllerType& controller)
+        : m_controller(controller)
     {}
-    ControllerContext(CancellableScope& parent, ControllerType& botbase)
-        : m_controller(botbase)
+    ControllerContext(CancellableScope& parent, ControllerType& controller)
+        : m_controller(controller)
     {
         attach(parent);
     }

SerialPrograms/Source/NintendoSwitch/DevPrograms/JoyconProgram.cpp

@@ -8,10 +8,9 @@
 #include "NintendoSwitch/Controllers/NintendoSwitch_Joycon.h"
 #include "JoyconProgram.h"
 
-//  REMOVE
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp

@@ -107,7 +107,8 @@ void MultiSwitchProgramSession::run_program_instance(MultiSwitchProgramEnvironme
     try{
         m_option.instance().program(env, scope);
         for (size_t c = 0; c < consoles; c++){
-            env.consoles[c].controller().wait_for_all(&scope);
+            ControllerContext<AbstractController> context(scope, env.consoles[c].controller());
+            context.wait_for_all_requests();
         }
     }catch (...){
         for (size_t c = 0; c < consoles; c++){

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp

@@ -12,13 +12,14 @@
 #include "CommonFramework/Options/Environment/PerformanceOptions.h"
 #include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
 #include "NintendoSwitch_SingleSwitchProgramOption.h"
 #include "NintendoSwitch_SingleSwitchProgramSession.h"
 
-
 #define PA_CATCH_PROGRAM_SYSTEM_EXCEPTIONS
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 
 namespace PokemonAutomation{
@@ -81,7 +82,9 @@ void SingleSwitchProgramSession::run_program_instance(SingleSwitchProgramEnviron
 #ifdef PA_CATCH_PROGRAM_SYSTEM_EXCEPTIONS
     try{
         m_option.instance().program(env, scope);
-        env.console.controller().wait_for_all(&scope);
+
+        ControllerContext<AbstractController> context(scope, env.console.controller());
+        context.wait_for_all_requests();
     }catch (...){
         env.console.controller().cancel_all_commands();
         m_scope.store(nullptr, std::memory_order_release);
@@ -97,7 +100,7 @@ void SingleSwitchProgramSession::run_program_instance(SingleSwitchProgramEnviron
 }
 void SingleSwitchProgramSession::internal_stop_program(){
     WriteSpinLock lg(m_lock);
-//    m_system.serial_session().stop();
+
     CancellableScope* scope = m_scope.load(std::memory_order_acquire);
     if (scope != nullptr){
         scope->cancel(std::make_exception_ptr(ProgramCancelledException()));
@@ -107,8 +110,6 @@ void SingleSwitchProgramSession::internal_stop_program(){
     while (m_scope.load(std::memory_order_acquire) != nullptr){
         pause();
     }
-
-//    m_system.serial_session().reset();
 }
 void SingleSwitchProgramSession::internal_run_program(){
     GlobalSettings::instance().PERFORMANCE->REALTIME_THREAD_PRIORITY.set_on_this_thread();

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp

@@ -8,6 +8,10 @@
 #include "NintendoSwitch/Options/TurboMacroTable.h"
 #include "NintendoSwitch_TurboMacro.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{