Minor

Author: Mysticial

SerialPrograms/Source/CommonFramework/Main.cpp

@@ -234,6 +234,18 @@ int main(int argc, char *argv[]){
     global_watchdog().stop();
     static_cast<FileWindowLogger&>(global_logger_raw()).stop();
 
+//
+//  Workaround Qt 6.9 thread-adoption bug on Windows.
+//      https://github.com/PokemonAutomation/Arduino-Source/issues/570
+//      https://bugreports.qt.io/browse/QTBUG-131892
+//
+//  Joining threads on Qt 6.9+ Windows will hang!
+//
+#ifdef PA_ENABLE_QT_ADOPTION_WORKAROUND
+    cout << "Qt6.9 bug workaround: std::quick_exit() to avoid thread join hangs." << endl;
+    std::quick_exit(ret);
+#endif
+
     //  Force stop the thread pools.
     //  This is where all the threads in the program are joined.
     PokemonAutomation::GlobalThreadPools::computation_realtime().stop();
@@ -247,17 +259,5 @@ int main(int argc, char *argv[]){
 
     cout << "Exiting main()..." << endl;
 
-//
-//  Workaround Qt 6.9 thread-adoption bug on Windows.
-//      https://github.com/PokemonAutomation/Arduino-Source/issues/570
-//      https://bugreports.qt.io/browse/QTBUG-131892
-//
-//  Joining threads on Qt 6.9+ Windows will hang!
-//
-#ifdef PA_ENABLE_QT_ADOPTION_WORKAROUND
-    cout << "Qt6.9 bug workaround: std::quick_exit() to avoid thread join hangs." << endl;
-    std::quick_exit(ret);
-#endif
-
     return ret;
 }

SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Panels.cpp

@@ -35,10 +35,8 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     //ret.emplace_back("---- General ----");
 
     ret.emplace_back("---- Shiny Hunting  ----");
-    if (IS_BETA_VERSION){
-        ret.emplace_back(make_single_switch_program<GiftReset_Descriptor, GiftReset>());
-        ret.emplace_back(make_single_switch_program<LegendaryReset_Descriptor, LegendaryReset>());
-    }
+    ret.emplace_back(make_single_switch_program<GiftReset_Descriptor, GiftReset>());
+    ret.emplace_back(make_single_switch_program<LegendaryReset_Descriptor, LegendaryReset>());
     if (PreloadSettings::instance().DEVELOPER_MODE){
         ret.emplace_back(make_single_switch_program<LegendaryRunAway_Descriptor, LegendaryRunAway>());
         ret.emplace_back(make_single_switch_program<PrizeCornerReset_Descriptor, PrizeCornerReset>());