More Tera Multi-Farmer fixes.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp

@@ -203,9 +203,11 @@ void MultiSwitchProgramSession::internal_run_program(){
 //        m_setup->wait_for_all_requests();
         env.add_overlay_log_to_all_consoles("- Program Finished -");
         logger().log("Program finished normally!", COLOR_BLUE);
-    }catch (OperationCancelledException&){
+    }catch (OperationCancelledException& e){
+        logger().log("Program Stopped (OperationCancelledException): " + e.message(), COLOR_RED);
         env.add_overlay_log_to_all_consoles("- Program Stopped -");
-    }catch (ProgramCancelledException&){
+    }catch (ProgramCancelledException& e){
+        logger().log("Program Stopped (ProgramCancelledException): " + e.message(), COLOR_BLUE);
         env.add_overlay_log_to_all_consoles("- Program Stopped -");
     }catch (ProgramFinishedException& e){
         logger().log("Program finished early!", COLOR_BLUE);

SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp

@@ -457,7 +457,7 @@ bool TeraMultiFarmer::run_raid(
     CancellableHolder<RaidWaiter> raid_waiter(scope);
     CancellableHolder<CancellableScope> joiner_scope((CancellableScope&)raid_waiter);
 
-    env.run_in_parallel(raid_waiter, [&](ConsoleHandle& console, ProControllerContext& context){
+    env.run_in_parallel(scope, [&](ConsoleHandle& console, ProControllerContext& context){
         try{
             if (console.index() == host_index){
                 start_sequence_host(

SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp

@@ -220,7 +220,7 @@ void enter_tera_search(
         OverworldWatcher overworld(stream.logger(), COLOR_RED);
         MainMenuWatcher main_menu(COLOR_YELLOW);
         PokePortalWatcher poke_portal(COLOR_GREEN);
-        TeraRaidSearchWatcher raid_search(COLOR_CYAN);
+        TeraRaidSearchWatcher raid_search(COLOR_CYAN, std::chrono::milliseconds(500));
         CodeEntryWatcher code_entry(COLOR_PURPLE);
         AdvanceDialogWatcher dialog(COLOR_BLUE);
         context.wait_for_all_requests();