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

fix, virtual display bugs

Browse Source 
1. Clear the map on reset.
2. Replace `containsKey` to `contains` in flutter.

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-10-30 21:37:40 +08:00
parent 06dda24431
commit 5adce88c37
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
flutter/lib/models/model.dart
View File

@ -667,11 +667,12 @@ class FfiModel with ChangeNotifier {
if (connType == ConnType.fileTransfer) { if (connType == ConnType.fileTransfer) {
parent.target?.fileModel.onReady(); parent.target?.fileModel.onReady();
} else if (connType == ConnType.defaultConn) { } else if (connType == ConnType.defaultConn) {
_pi.displays = []; List<Display> newDisplays = [];
List<dynamic> displays = json.decode(evt['displays']); List<dynamic> displays = json.decode(evt['displays']);
for (int i = 0; i < displays.length; ++i) { for (int i = 0; i < displays.length; ++i) {
_pi.displays.add(evtToDisplay(displays[i])); newDisplays.add(evtToDisplay(displays[i]));
} }
_pi.displays.value = newDisplays;
_pi.displaysCount.value = _pi.displays.length; _pi.displaysCount.value = _pi.displays.length;
if (_pi.currentDisplay < _pi.displays.length) { if (_pi.currentDisplay < _pi.displays.length) {
// now replaced to _updateCurDisplay // now replaced to _updateCurDisplay
@ -861,7 +862,7 @@ class FfiModel with ChangeNotifier {
for (int i = 0; i < displays.length; ++i) { for (int i = 0; i < displays.length; ++i) {
newDisplays.add(evtToDisplay(displays[i])); newDisplays.add(evtToDisplay(displays[i]));
} }
_pi.displays = newDisplays; _pi.displays.value = newDisplays;
_pi.displaysCount.value = _pi.displays.length; _pi.displaysCount.value = _pi.displays.length;
if (_pi.currentDisplay == kAllDisplayValue) { if (_pi.currentDisplay == kAllDisplayValue) {
@ -909,11 +910,11 @@ class FfiModel with ChangeNotifier {
_pi.platformAdditions.remove(kPlatformAdditionsVirtualDisplays); _pi.platformAdditions.remove(kPlatformAdditionsVirtualDisplays);
} else { } else {
try { try {
final updateJson = json.decode(updateData); final updateJson = json.decode(updateData) as Map<String, dynamic>;
for (final key in updateJson.keys) { for (final key in updateJson.keys) {
_pi.platformAdditions[key] = updateJson[key]; _pi.platformAdditions[key] = updateJson[key];
} }
if (!updateJson.contains(kPlatformAdditionsVirtualDisplays)) { if (!updateJson.containsKey(kPlatformAdditionsVirtualDisplays)) {
_pi.platformAdditions.remove(kPlatformAdditionsVirtualDisplays); _pi.platformAdditions.remove(kPlatformAdditionsVirtualDisplays);
} }
} catch (e) { } catch (e) {
@ -2322,7 +2323,7 @@ class PeerInfo with ChangeNotifier {
bool isSupportMultiUiSession = false; bool isSupportMultiUiSession = false;
int currentDisplay = 0; int currentDisplay = 0;
int primaryDisplay = kInvalidDisplayIndex; int primaryDisplay = kInvalidDisplayIndex;
List<Display> displays = []; RxList<Display> displays = <Display>[].obs;
Features features = Features(); Features features = Features();
List<Resolution> resolutions = []; List<Resolution> resolutions = [];
Map<String, dynamic> platformAdditions = {}; Map<String, dynamic> platformAdditions = {};

2
src/virtual_display_manager.rs
View File

@ -142,6 +142,8 @@ pub fn reset_all() -> ResultType<()> {
let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap(); let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
if !manager.peer_index_name.is_empty() || manager.headless_index_name.is_some() { if !manager.peer_index_name.is_empty() || manager.headless_index_name.is_some() {
manager.install_update_driver()?; manager.install_update_driver()?;
manager.peer_index_name.clear();
manager.headless_index_name = None;
} }
Ok(()) Ok(())
} }