server menu: handle proxy

Piglit · Aug 30, 2024 · 50e18c2 · 50e18c2
1 parent 47dcb0d
commit 50e18c2
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/menus/serverCreationScreen.cpp b/src/menus/serverCreationScreen.cpp
@@ -430,17 +430,7 @@ ServerCampaignScreen::ServerCampaignScreen()
         auto filename = scenario_list->getEntryValue(scenario_list->getSelectionIndex());
         ScenarioInfo info(filename);
 
-        if (info.settings.empty())
-        {
-            // Start the selected scenario.
-            gameGlobalInfo->scenario = info.name;
-            gameGlobalInfo->startScenario(filename);
-
-            // Destroy this screen and move on to control screen 
-            destroy();
-            new MissionControlScreen(getRenderLayer());
-        }
-        else if (info.proxy != "")
+        if (info.proxy != "")
         {
             string host_name = info.proxy;
             auto host = sp::io::network::Address(host_name);
@@ -454,13 +444,22 @@ ServerCampaignScreen::ServerCampaignScreen()
             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);
-            // FIXME: use the correct event
-            campaign_client->notifyCampaignServer("scenario_start", nlohmann::json {
+            campaign_client->notifyCampaignServer("scenario_join", nlohmann::json {
                 {"filename", info.filename.c_str()},
                 {"name", info.name.c_str()},
             });
             destroy();
         }
+        else if (info.settings.empty())
+        {
+            // Start the selected scenario.
+            gameGlobalInfo->scenario = info.name;
+            gameGlobalInfo->startScenario(filename);
+
+            // Destroy this screen and move on to control screen 
+            destroy();
+            new MissionControlScreen(getRenderLayer());
+        }
         else
         {
             new ServerScenarioOptionsScreen(filename);