From 03e1bf53d0836d80273dd926a49b52111dbc1a2d Mon Sep 17 00:00:00 2001 From: ChristianVisintin Date: Sat, 16 Jan 2021 11:16:31 +0100 Subject: [PATCH] Solved index of files list no more kept after 0.3.0 --- CHANGELOG.md | 2 ++ src/ui/activities/filetransfer_activity/session.rs | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a20922..868c191 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ FIXME: Released on ??? - Enhancements: - Added connection timeout to 30 seconds to SFTP/SCP clients and improved name lookup system. +- Bugfix: + - Solved index in explorer files list which was no more kept after 0.3.0 ## 0.3.0 diff --git a/src/ui/activities/filetransfer_activity/session.rs b/src/ui/activities/filetransfer_activity/session.rs index c3e19f2..035cc0f 100644 --- a/src/ui/activities/filetransfer_activity/session.rs +++ b/src/ui/activities/filetransfer_activity/session.rs @@ -600,7 +600,10 @@ impl FileTransferActivity { match self.context.as_ref().unwrap().local.scan_dir(path) { Ok(files) => { // Set files and sort (sorting is implicit) + let prev_index: usize = self.local.get_index(); self.local.set_files(files); + // Restore index + self.local.set_index(prev_index); // Set index; keep if possible, otherwise set to last item self.local.set_index(match self.local.get_current_file() { Some(_) => self.local.get_index(), @@ -626,7 +629,10 @@ impl FileTransferActivity { match self.client.list_dir(path) { Ok(files) => { // Set files and sort (sorting is implicit) + let prev_index: usize = self.remote.get_index(); self.remote.set_files(files); + // Restore index + self.remote.set_index(prev_index); // Set index; keep if possible, otherwise set to last item self.remote.set_index(match self.remote.get_current_file() { Some(_) => self.remote.get_index(),