rust/src/cli_parser.rs

@@ -1,9 +1,6 @@
 use std::net::SocketAddr;
 
-use godot::{
+use godot::{classes::Os, prelude::*};
-    classes::{DisplayServer, Os},
-    prelude::*,
-};
 
 use crate::{
     game::{Game, GameManager},
@@ -91,9 +88,7 @@ impl INode3D for CliParser {
             .connect_other(self, |s| s.on_join_lobby());
 
         if let Some(port) = options.host {
-            NetworkManager::singleton()
+            NetworkManager::singleton().bind_mut().host(port, false);
-                .bind_mut()
-                .host(port, DisplayServer::singleton().get_name() == "headless");
         } else if let Some(addr) = options.join {
             NetworkManager::singleton().bind_mut().join_directly(addr);
         }

rust/src/ui/game_finished_screen.rs

@@ -51,20 +51,14 @@ impl IPanel for GameFinishedScreen {
                 .connect_other(self, Self::save_replay);
         }
 
-        if let Some(game) = &mut Game::singleton() {
+        if let Some(game) = &mut Game::singleton()
-            if let Some(recorder) = &mut game.bind_mut().replay_recorder {
+            && let Some(recorder) = &mut game.bind_mut().replay_recorder
+        {
             recorder
                 .signals()
                 .on_saved()
                 .connect_other(self, Self::on_replay_saved);
         }
-            if game.bind().is_host() && game.bind().self_id.is_none() {
-                game.bind_mut().reset_game();
-                self.run_deferred(|_| {
-                    GameManager::singleton().bind().go_to_lobby();
-                });
-            }
-        }
 
         if let Some(focus) = &mut self.base_mut().find_next_valid_focus() {
             focus.grab_focus();