mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-12-01 18:09:15 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix issue #2921

Browse Source
This commit is contained in:
rustdesk 2023-01-26 11:25:05 +08:00
parent 917b3d2213
commit cb5855a273
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui_interface.rs
View File

@ -236,7 +236,7 @@ pub fn set_peer_option(id: String, name: String, value: String) {
#[inline] #[inline]
pub fn using_public_server() -> bool { pub fn using_public_server() -> bool {
option_env!("RENDEZVOUS_SERVER").is_none() option_env!("RENDEZVOUS_SERVER").unwrap_or("").is_empty()
&& crate::get_custom_rendezvous_server(get_option_("custom-rendezvous-server")).is_empty() && crate::get_custom_rendezvous_server(get_option_("custom-rendezvous-server")).is_empty()
} }

6
src/ui_session_interface.rs
View File

@ -6,10 +6,11 @@ use crate::client::{
}; };
use crate::common::{self, GrabState}; use crate::common::{self, GrabState};
use crate::keyboard; use crate::keyboard;
use crate::ui_interface::using_public_server;
use crate::{client::Data, client::Interface}; use crate::{client::Data, client::Interface};
use async_trait::async_trait; use async_trait::async_trait;
use bytes::Bytes; use bytes::Bytes;
use hbb_common::config::{Config, LocalConfig, PeerConfig}; use hbb_common::config::{Config, LocalConfig, PeerConfig, RS_PUB_KEY};
use hbb_common::rendezvous_proto::ConnType; use hbb_common::rendezvous_proto::ConnType;
use hbb_common::tokio::{self, sync::mpsc}; use hbb_common::tokio::{self, sync::mpsc};
use hbb_common::{allow_err, message_proto::*}; use hbb_common::{allow_err, message_proto::*};
@ -835,6 +836,9 @@ pub async fn io_loop<T: InvokeUiSession>(handler: Session<T>) {
if key.is_empty() { if key.is_empty() {
key = crate::platform::get_license_key(); key = crate::platform::get_license_key();
} }
if key.is_empty() && !option_env!("RENDEZVOUS_SERVER").unwrap_or("").is_empty() {
key = RS_PUB_KEY.to_owned();
}
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
if handler.is_port_forward() { if handler.is_port_forward() {
if handler.is_rdp() { if handler.is_rdp() {