server menu proxy spawn

Piglit · Aug 30, 2024 · 2531b18 · 2531b18
1 parent e003b4e
commit 2531b18
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/menus/serverCreationScreen.cpp b/src/menus/serverCreationScreen.cpp
@@ -440,14 +440,15 @@ ServerCampaignScreen::ServerCampaignScreen()
             int listenPort = game_server->getPort();
             string proxyName = PreferencesManager::get("shipname", "");
 
+            // before disconnectFromServer, since it destroys gameGlobalInfo:
+            gameGlobalInfo->scenario = info.name;
+            gameGlobalInfo->scenario_filename = filename;
+            gameGlobalInfo->notifyCampaignServerScenario("joined");
+
             disconnectFromServer();
             new GameServerProxy(host, port, password, listenPort, proxyName);
             std::this_thread::sleep_for(std::chrono::milliseconds(100));
             //new JoinServerScreen(ServerBrowserMenu::SearchSource::Local, sp::io::network::Address("127.0.0.1"), listenPort);
-            // not working:
-            gameGlobalInfo->scenario = info.name;
-            gameGlobalInfo->scenario_filename = filename;
-            gameGlobalInfo->notifyCampaignServerScenario("joined");
             destroy();
             new MissionControlScreen(getRenderLayer());
         }