weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI

Browse Source
This commit is contained in:
rustdesk
2023-02-10 17:48:53 +08:00
parent 930faecb13
commit 7edb3e6e92
8 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/connection.rs
View File

@@ -2045,7 +2045,7 @@ mod privacy_mode {
pub(super) fn turn_off_privacy(_conn_id: i32) -> Message {
#[cfg(windows)]
{
use crate::ui::win_privacy::*;
use crate::win_privacy::*;
let res = turn_off_privacy(_conn_id, None);
match res {
@@ -2069,7 +2069,7 @@ mod privacy_mode {
pub(super) fn turn_on_privacy(_conn_id: i32) -> ResultType<bool> {
#[cfg(windows)]
{
let plugin_exist = crate::ui::win_privacy::turn_on_privacy(_conn_id)?;
let plugin_exist = crate::win_privacy::turn_on_privacy(_conn_id)?;
Ok(plugin_exist)
}
#[cfg(not(windows))]

10
src/server/video_service.rs
View File

@@ -207,7 +207,7 @@ fn create_capturer(
if privacy_mode_id > 0 {
#[cfg(windows)]
{
use crate::ui::win_privacy::*;
use crate::win_privacy::*;
match scrap::CapturerMag::new(
display.origin(),
@@ -308,11 +308,11 @@ pub fn test_create_capturer(privacy_mode_id: i32, timeout_millis: u64) -> bool {
fn check_uac_switch(privacy_mode_id: i32, capturer_privacy_mode_id: i32) -> ResultType<()> {
if capturer_privacy_mode_id != 0 {
if privacy_mode_id != capturer_privacy_mode_id {
if !crate::ui::win_privacy::is_process_consent_running()? {
if !crate::win_privacy::is_process_consent_running()? {
bail!("consent.exe is running");
}
}
if crate::ui::win_privacy::is_process_consent_running()? {
if crate::win_privacy::is_process_consent_running()? {
bail!("consent.exe is running");
}
}
@@ -372,7 +372,7 @@ fn get_capturer(use_yuv: bool, portable_service_running: bool) -> ResultType<Cap
let mut capturer_privacy_mode_id = privacy_mode_id;
#[cfg(windows)]
if capturer_privacy_mode_id != 0 {
if crate::ui::win_privacy::is_process_consent_running()? {
if crate::win_privacy::is_process_consent_running()? {
capturer_privacy_mode_id = 0;
}
}
@@ -957,7 +957,7 @@ fn start_uac_elevation_check() {
if !crate::platform::is_installed() && !crate::platform::is_root() {
std::thread::spawn(|| loop {
std::thread::sleep(std::time::Duration::from_secs(1));
if let Ok(uac) = crate::ui::win_privacy::is_process_consent_running() {
if let Ok(uac) = crate::win_privacy::is_process_consent_running() {
*IS_UAC_RUNNING.lock().unwrap() = uac;
}
if !crate::platform::is_elevated(None).unwrap_or(false) {