hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5616 from sahilyeole/fix/frequent_loginctl_calls

Browse Source 
Fix frequent loginctl calls
This commit is contained in:
RustDesk 2023-09-07 08:38:12 +08:00 committed by GitHub
commit 5e1eda9e97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/hbb_common/src/platform/linux.rs
View File

@ -183,6 +183,15 @@ pub fn is_active(sid: &str) -> bool {
} }
} }
pub fn is_active_and_seat0(sid: &str) -> bool {
if let Ok(output) = run_loginctl(Some(vec!["show-session", sid])) {
String::from_utf8_lossy(&output.stdout).contains("State=active")
&& String::from_utf8_lossy(&output.stdout).contains("Seat=seat0")
} else {
false
}
}
pub fn run_cmds(cmds: &str) -> ResultType<String> { pub fn run_cmds(cmds: &str) -> ResultType<String> {
let output = std::process::Command::new("sh") let output = std::process::Command::new("sh")
.args(vec!["-c", cmds]) .args(vec!["-c", cmds])

6
src/platform/linux.rs
View File

@ -1073,13 +1073,11 @@ mod desktop {
} }
pub fn refresh(&mut self) { pub fn refresh(&mut self) {
let seat0_values = get_values_of_seat0(&[0, 1, 2]); if !self.sid.is_empty() && is_active_and_seat0(&self.sid) {
if !self.sid.is_empty() && is_active(&self.sid) {
if self.sid == seat0_values[0] {
return; return;
}
} }
let seat0_values = get_values_of_seat0(&[0, 1, 2]);
if seat0_values[0].is_empty() { if seat0_values[0].is_empty() {
*self = Self::default(); *self = Self::default();
self.is_rustdesk_subprocess = false; self.is_rustdesk_subprocess = false;