Don't use option

alvr-org · Oct 20, 2024 · 74ae4ca · 74ae4ca
1 parent 8ef30b9
commit 74ae4ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/alvr/client_core/src/connection.rs b/alvr/client_core/src/connection.rs
@@ -234,9 +234,10 @@ fn connection_pipeline(
         }
     }
 
-    let stream_protocol = match negotiated_config.wired.is_some_and(|w| w) {
-        false => settings.connection.stream_protocol,
-        true => SocketProtocol::Tcp,
+    let stream_protocol = if negotiated_config.wired {
+        SocketProtocol::Tcp
+    } else {
+        settings.connection.stream_protocol
     };
 
     dbg_connection!("connection_pipeline: create StreamSocket");

diff --git a/alvr/packets/src/lib.rs b/alvr/packets/src/lib.rs
@@ -119,7 +119,7 @@ pub struct NegotiatedStreamingConfig {
     // This is needed to detect when to use SteamVR hand trackers. This does NOT imply if multimodal
     // input is supported
     pub use_multimodal_protocol: bool,
-    pub wired: Option<bool>,
+    pub wired: bool,
 }
 
 #[derive(Serialize, Deserialize)]

diff --git a/alvr/server_core/src/connection.rs b/alvr/server_core/src/connection.rs
@@ -648,7 +648,7 @@ fn connection_pipeline(
             0
         };
 
-    let wired = Some(client_ip.is_loopback());
+    let wired = client_ip.is_loopback();
 
     dbg_connection!("connection_pipeline: send streaming config");
     let stream_config_packet = alvr_packets::encode_stream_config(