Merge pull request #1148 from 21pages/restart

fix: hide restart menu item if version < 1.1.10
This commit is contained in:
RustDesk 2022-08-02 11:37:16 +08:00 committed by GitHub
commit d1eda57b2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,10 +23,6 @@ use clipboard::{
get_rx_clip_client, server_clip_file, get_rx_clip_client, server_clip_file,
}; };
use enigo::{self, Enigo, KeyboardControllable}; use enigo::{self, Enigo, KeyboardControllable};
use hbb_common::fs::{
can_enable_overwrite_detection, get_job, get_string, new_send_confirm, DigestCheckResult,
RemoveJobMeta,
};
use hbb_common::{ use hbb_common::{
allow_err, allow_err,
config::{Config, LocalConfig, PeerConfig}, config::{Config, LocalConfig, PeerConfig},
@ -43,6 +39,13 @@ use hbb_common::{
Stream, Stream,
}; };
use hbb_common::{config::TransferSerde, fs::TransferJobMeta}; use hbb_common::{config::TransferSerde, fs::TransferJobMeta};
use hbb_common::{
fs::{
can_enable_overwrite_detection, get_job, get_string, new_send_confirm, DigestCheckResult,
RemoveJobMeta,
},
get_version_number,
};
#[cfg(windows)] #[cfg(windows)]
use crate::clipboard_file::*; use crate::clipboard_file::*;
@ -2604,6 +2607,9 @@ impl Interface for Handler {
pi_sciter.set_item("hostname", pi.hostname.clone()); pi_sciter.set_item("hostname", pi.hostname.clone());
pi_sciter.set_item("platform", pi.platform.clone()); pi_sciter.set_item("platform", pi.platform.clone());
pi_sciter.set_item("sas_enabled", pi.sas_enabled); pi_sciter.set_item("sas_enabled", pi.sas_enabled);
if get_version_number(&pi.version) < get_version_number("1.1.10") {
self.call2("setPermission", &make_args!("restart", false));
}
if self.is_file_transfer() { if self.is_file_transfer() {
if pi.username.is_empty() { if pi.username.is_empty() {
self.on_error("No active console user logged on, please connect and logon first."); self.on_error("No active console user logged on, please connect and logon first.");