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

Merge pull request #3605 from fufesou/fix/build_android

Browse Source 
fix build android
This commit is contained in:
RustDesk 2023-03-11 18:48:06 +08:00 committed by GitHub
commit 02e7e462cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flutter/lib/desktop/widgets/remote_menubar.dart
View File

@ -1437,6 +1437,9 @@ class _DisplayMenuState extends State<_DisplayMenu> {
}
showRemoteCursor() {
if (widget.ffi.ffiModel.pi.platform == kPeerPlatformAndroid) {
return Offstage();
}
final visible = !widget.ffi.canvasModel.cursorEmbedded;
if (!visible) return Offstage();
final state = ShowRemoteCursorState.find(widget.id);
@ -1454,6 +1457,9 @@ class _DisplayMenuState extends State<_DisplayMenu> {
}
zoomCursor() {
if (widget.ffi.ffiModel.pi.platform == kPeerPlatformAndroid) {
return Offstage();
}
final visible = widget.state.viewStyle.value != kRemoteViewStyleOriginal;
if (!visible) return Offstage();
final option = 'zoom-cursor';

3
src/server/connection.rs
View File

@ -543,6 +543,7 @@ impl Connection {
if let Some(s) = conn.server.upgrade() {
let mut s = s.write().unwrap();
s.remove_connection(&conn.inner);
#[cfg(not(any(target_os = "android", target_os = "ios")))]
try_stop_record_cursor_pos();
}
log::info!("#{} connection loop exited", id);
@ -951,6 +952,7 @@ impl Connection {
noperms.push(super::audio_service::NAME);
}
let mut s = s.write().unwrap();
#[cfg(not(any(target_os = "android", target_os = "ios")))]
try_start_record_cursor_pos();
s.add_connection(self.inner.clone(), &noperms);
}
@ -1740,6 +1742,7 @@ impl Connection {
self.lock_after_session_end = q == BoolOption::Yes;
}
}
#[cfg(not(any(target_os = "android", target_os = "ios")))]
if let Ok(q) = o.show_remote_cursor.enum_value() {
if q != BoolOption::NotSet {
self.show_remote_cursor = q == BoolOption::Yes;