Skip to content

Commit

Permalink
Fix windows compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Jontified committed Jan 2, 2024
1 parent f840ce9 commit e6cebfa
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions talpid-core/src/tunnel/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use talpid_openvpn;
use talpid_routing::RouteManagerHandle;
pub use talpid_tunnel::{TunnelArgs, TunnelEvent, TunnelMetadata};
#[cfg(not(target_os = "android"))]
use talpid_types::net::openvpn as openvpn_types;
use talpid_types::net::proxy;
use talpid_types::net::{wireguard as wireguard_types, TunnelParameters};

/// A module for all WireGuard related tunnel management.
Expand Down Expand Up @@ -112,11 +112,9 @@ impl TunnelMonitor {
let resource_dir = resource_dir.to_path_buf();
match params {
TunnelParameters::OpenVpn(params) => match &params.proxy {
Some(openvpn_types::ProxySettings::Shadowsocks(_)) => {
Some(std::env::current_exe().unwrap())
}
Some(openvpn_types::ProxySettings::Local(_)) => None,
Some(openvpn_types::ProxySettings::Remote(_)) | None => {
Some(proxy::CustomProxy::Shadowsocks(_)) => Some(std::env::current_exe().unwrap()),
Some(proxy::CustomProxy::Socks5Local(_)) => None,
Some(proxy::CustomProxy::Socks5Remote(_)) | None => {
Some(resource_dir.join("openvpn.exe"))
}
},
Expand Down

0 comments on commit e6cebfa

Please sign in to comment.