Fix crash in keyboard controls. Clear nugget farmer for SBB.

Author: Mysticial

SerialPrograms/Source/Controllers/KeyboardInput/GlobalQtKeyMap.cpp

@@ -5,7 +5,6 @@
  */
 
 #include <QKeyEvent>
-#include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "GlobalQtKeyMap.h"
 
@@ -23,16 +22,13 @@ void QtKeyMap::record(const QKeyEvent& event){
     m_map[native_key].insert(qkey);
 }
 
-const std::set<Qt::Key>& QtKeyMap::get_QtKeys(uint32_t native_key) const{
+const std::set<Qt::Key>* QtKeyMap::get_QtKeys(uint32_t native_key) const{
     ReadSpinLock lg(m_lock);
     auto iter = m_map.find(native_key);
     if (iter == m_map.end()){
-        throw InternalProgramError(
-            nullptr, PA_CURRENT_FUNCTION,
-            "Attempted to look up unrecognized native keyboard key: " + std::to_string(native_key)
-        );
+        return nullptr;
     }
-    return iter->second;
+    return &iter->second;
 }
 
 

SerialPrograms/Source/Controllers/KeyboardInput/GlobalQtKeyMap.h

@@ -26,7 +26,7 @@ class QtKeyMap{
 
     void record(const QKeyEvent& event);
 
-    const std::set<Qt::Key>& get_QtKeys(uint32_t native_key) const;
+    const std::set<Qt::Key>* get_QtKeys(uint32_t native_key) const;
 
 
 private:

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.cpp

@@ -53,8 +53,11 @@ class ProController::KeyboardManager : public KeyboardInputController{
         ControllerDeltas deltas;
         const QtKeyMap& qkey_map = QtKeyMap::instance();
         for (uint32_t native_key : pressed_keys){
-            const std::set<Qt::Key>& qkeys = qkey_map.get_QtKeys(native_key);
-            for (Qt::Key qkey : qkeys){
+            const std::set<Qt::Key>* qkeys = qkey_map.get_QtKeys(native_key);
+            if (qkeys == nullptr){
+                continue;
+            }
+            for (Qt::Key qkey : *qkeys){
                 auto iter = m_mapping.find(qkey);
                 if (iter != m_mapping.end()){
                     deltas += iter->second;

SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp

@@ -22,9 +22,9 @@
 #include "PokemonLA/Programs/PokemonLA_RegionNavigation.h"
 #include "PokemonLA_NuggetFarmerHighlands.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -40,7 +40,8 @@ NuggetFarmerHighlands_Descriptor::NuggetFarmerHighlands_Descriptor()
         "Farm nuggets off the Miss Fortune sisters in the Coronet Highlands.",
         FeedbackType::VIDEO_AUDIO,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 class NuggetFarmerHighlands_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{