Merge branch 'main' into rtp-84-integrate-multiple-enemies-types-and-bosses

Author: TekMath

client/src/scenes/lobby.cpp

@@ -38,9 +38,6 @@ void SceneLobby::OnCreate() {
 }
 
 void SceneLobby::OnActivate() {
-  if (status_ == LobbyStatus::kIn) {
-    return managers_.scenes->GoToScene<SceneGame>();
-  }
   WaitAsync();
 }
 
@@ -138,3 +135,12 @@ void SceneLobby::UpdateStatusText() {
     return;
   }
 }
+void SceneLobby::OnDeactivate() {
+    if (joiningThread_ && joiningThread_->joinable()) {
+        joiningThread_->join();
+    }
+    joiningThread_.reset();
+    status_ = LobbyStatus::kNone;
+    mainMessage_ = "";
+    secondaryMessage_ = "";
+}

client/src/scenes/lobby.hpp

@@ -32,6 +32,8 @@ class SceneLobby final : public SceneBase {
 
   void OnActivate() override;
 
+  void OnDeactivate() override;
+
  private:
   /**
    * @brief Create the title

client/src/scenes/start/start.cpp

@@ -237,13 +237,14 @@ void SceneStart::CreateBackButton() {
 }
 
 void SceneStart::UpdateSelects() {
-  if (roomsService_->GetLastRefreshTime() <= lastRefreshTime_) {
+  auto last_node_id = selectedNode_;
+  UpdateSelectedNode();
+  if (roomsService_->GetLastRefreshTime() <= lastRefreshTime_ && last_node_id == selectedNode_) {
     return;
   }
   lastRefreshTime_ = roomsService_->GetLastRefreshTime();
   auto rooms = roomsService_->GetRooms();
   Select::Update(registry_, GetNodeSelectProps(rooms));
-  UpdateSelectedNode();
   Select::Update(registry_, GetRoomsSelectProps(rooms, selectedNode_));
 }
 

client/src/scenes/start/start.hpp

@@ -139,5 +139,8 @@ class SceneStart final : public SceneBase {
 
   /// @Selected node
   std::optional<services::RoomsService::NodeIdType> selectedNode_;
+
+  /// @Last selected node
+  std::optional<std::string> lastSelectedNodeStrId_;
 };
 }  // namespace rtype::client::scenes