leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not cd to path that is not a directory, fixes #87

Browse source
This commit is contained in:
Jeremy Soller 2024-03-18 14:46:54 -06:00
parent af4828a509
commit d15372a635
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/tab.rs
View file

@ -1233,22 +1233,29 @@ impl Tab {
} }
if let Some(location) = cd { if let Some(location) = cd {
if location != self.location { if location != self.location {
self.location = location.clone(); if match &location {
self.items_opt = None; Location::Path(path) => path.is_dir(),
self.select_focus = None; Location::Trash => true,
self.edit_location = None; } {
if let Some(history_i) = history_i_opt { self.location = location.clone();
// Navigating in history self.items_opt = None;
self.history_i = history_i; self.select_focus = None;
} else { self.edit_location = None;
// Truncate history to remove next entries if let Some(history_i) = history_i_opt {
self.history.truncate(self.history_i + 1); // Navigating in history
self.history_i = history_i;
} else {
// Truncate history to remove next entries
self.history.truncate(self.history_i + 1);
// Push to the front of history // Push to the front of history
self.history_i = self.history.len(); self.history_i = self.history.len();
self.history.push(location.clone()); self.history.push(location.clone());
}
commands.push(Command::ChangeLocation(self.title(), location));
} else {
log::warn!("tried to cd to {:?} which is not a directory", location);
} }
commands.push(Command::ChangeLocation(self.title(), location));
} }
} }
commands commands