mirror of
https://github.com/rustdesk/rustdesk.git
synced 2025-06-07 09:52:49 +08:00
remove is_rdp_service_open judgement for option share rdp (#7257)
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
parent
4c8c2aa323
commit
b511a52e09
@ -830,7 +830,7 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
|
||||
|
||||
bool value = bind.mainIsShareRdp();
|
||||
return Offstage(
|
||||
offstage: !(Platform.isWindows && bind.mainIsRdpServiceOpen()),
|
||||
offstage: !(Platform.isWindows && bind.mainIsInstalled()),
|
||||
child: GestureDetector(
|
||||
child: Row(
|
||||
children: [
|
||||
|
@ -1679,10 +1679,6 @@ pub fn main_is_share_rdp() -> SyncReturn<bool> {
|
||||
SyncReturn(is_share_rdp())
|
||||
}
|
||||
|
||||
pub fn main_is_rdp_service_open() -> SyncReturn<bool> {
|
||||
SyncReturn(is_rdp_service_open())
|
||||
}
|
||||
|
||||
pub fn main_set_share_rdp(enable: bool) {
|
||||
set_share_rdp(enable)
|
||||
}
|
||||
|
@ -51,7 +51,10 @@ pub struct StrategyOptions {
|
||||
#[cfg(not(any(target_os = "ios")))]
|
||||
#[tokio::main(flavor = "current_thread")]
|
||||
async fn start_hbbs_sync_async() {
|
||||
let mut interval = crate::rustdesk_interval(tokio::time::interval_at(Instant::now() + TIME_CONN, TIME_CONN));
|
||||
let mut interval = crate::rustdesk_interval(tokio::time::interval_at(
|
||||
Instant::now() + TIME_CONN,
|
||||
TIME_CONN,
|
||||
));
|
||||
let mut last_sent: Option<Instant> = None;
|
||||
let mut info_uploaded: (bool, String, Option<Instant>) = (false, "".to_owned(), None);
|
||||
loop {
|
||||
@ -150,7 +153,7 @@ fn handle_config_options(config_options: HashMap<String, String>) {
|
||||
if k == "allow-share-rdp" {
|
||||
// only changes made after installation take effect.
|
||||
#[cfg(windows)]
|
||||
if crate::ui_interface::is_rdp_service_open() {
|
||||
if crate::platform::is_installed() {
|
||||
let current = crate::ui_interface::is_share_rdp();
|
||||
let set = v == "Y";
|
||||
if current != set {
|
||||
|
@ -325,10 +325,6 @@ impl UI {
|
||||
return false;
|
||||
}
|
||||
|
||||
fn is_rdp_service_open(&self) -> bool {
|
||||
is_rdp_service_open()
|
||||
}
|
||||
|
||||
fn is_share_rdp(&self) -> bool {
|
||||
is_share_rdp()
|
||||
}
|
||||
@ -661,7 +657,6 @@ impl sciter::EventHandler for UI {
|
||||
fn is_release();
|
||||
fn set_socks(String, String, String);
|
||||
fn get_socks();
|
||||
fn is_rdp_service_open();
|
||||
fn is_share_rdp();
|
||||
fn set_share_rdp(bool);
|
||||
fn is_installed_lower_version();
|
||||
|
@ -318,7 +318,7 @@ class MyIdMenu: Reactor.Component {
|
||||
<li #socks5-server>{translate('Socks5 Proxy')}</li>
|
||||
<div .separator />
|
||||
<li #stop-service class={service_stopped ? "line-through" : "selected"}><span>{svg_checkmark}</span>{translate("Enable service")}</li>
|
||||
{handler.is_rdp_service_open() ? <ShareRdp /> : ""}
|
||||
{is_win && handler.is_installed() ? <ShareRdp /> : ""}
|
||||
<DirectServer />
|
||||
{false && handler.using_public_server() && <li #allow-always-relay><span>{svg_checkmark}</span>{translate('Always connect via relay')}</li>}
|
||||
{handler.is_ok_change_id() ? <div .separator /> : ""}
|
||||
|
@ -425,14 +425,6 @@ pub fn is_installed() -> bool {
|
||||
false
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn is_rdp_service_open() -> bool {
|
||||
#[cfg(windows)]
|
||||
return is_installed() && crate::platform::windows::is_rdp_service_open();
|
||||
#[cfg(not(windows))]
|
||||
return false;
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn is_share_rdp() -> bool {
|
||||
#[cfg(windows)]
|
||||
|
Loading…
Reference in New Issue
Block a user