gcc 14:

- fix some more compilation errors, use after destroy

Author: Totto16

src/scenes/recording_selector/recording_selector.cpp

@@ -75,25 +75,24 @@ namespace scenes {
         if (m_next_command.has_value()) {
             return std::visit(
                     helper::overloaded{
-                            [](const Return&) {
-                                return UpdateResult{ SceneUpdate::StopUpdating, Scene::Pop{} };
-                            },
+                            [](const Return&) { return UpdateResult{ SceneUpdate::StopUpdating, Scene::Pop{} }; },
                             [this](const Action& action) {
-                                m_next_command = helper::nullopt;
-
                                 if (auto* recording_component =
                                             dynamic_cast<custom_ui::RecordingComponent*>(action.widget);
                                     recording_component != nullptr) {
 
                                     const auto recording_path = recording_component->metadata().path;
 
+                                    // action is a reference to a structure inside m_next_command, so resetting it means, we need to copy everything out of it
+                                    m_next_command = helper::nullopt;
+
                                     return UpdateResult{
                                         SceneUpdate::StopUpdating,
-                                        Scene::RawSwitch{"ReplayGame",
+                                        Scene::RawSwitch{ "ReplayGame",
                                                          std::make_unique<ReplayGame>(
-                                                         m_service_provider, ui::FullScreenLayout{ m_service_provider->window() },
+                                                                  m_service_provider, ui::FullScreenLayout{ m_service_provider->window() },
                                                          recording_path
-                                                         )}
+                                                          ) }
                                     };
                                 }
 #if defined(_HAVE_FILE_DIALOGS)
@@ -108,6 +107,9 @@ namespace scenes {
 
                                     add_all_recordings();
 
+                                    // action is a reference to a structure inside m_next_command, so resetting it means, we need to copy everything out of it
+                                    m_next_command = helper::nullopt;
+
                                     return UpdateResult{ SceneUpdate::StopUpdating, helper::nullopt };
                                 }
 

src/scenes/settings_menu/settings_menu.cpp

@@ -115,13 +115,14 @@ namespace scenes {
                                 return UpdateResult{ SceneUpdate::StopUpdating, Scene::Pop{} };
                             },
                             [this](const Action& action) {
-                                m_next_command = helper::nullopt;
-
                                 if (auto* settings_details = dynamic_cast<settings::SettingsDetails*>(action.widget);
                                     settings_details != nullptr) {
 
                                     auto change_scene = settings_details->get_details_scene();
 
+                                    // action is a reference to a structure inside m_next_command, so resetting it means, we need to copy everything out of it
+                                    m_next_command = helper::nullopt;
+
                                     return UpdateResult{ SceneUpdate::StopUpdating, std::move(change_scene) };
                                 }
 
@@ -151,7 +152,7 @@ namespace scenes {
         if (const auto event_result = m_main_layout.handle_event(event, window); event_result) {
             if (const auto additional = event_result.get_additional();
                 additional.has_value() and additional.value().first == ui::EventHandleType::RequestAction) {
-                m_next_command = Command{ Action(additional.value().second) };
+                m_next_command = Command{ Action{ additional.value().second } };
             }
 
             return true;