From 75bf6abc67b50177292f16aa2042950b189895e9 Mon Sep 17 00:00:00 2001 From: Toon Nolten Date: Wed, 16 May 2018 15:39:59 +0200 Subject: Actually check whether selection is a directory `Actions.move()` used `enter_dir()` to determine whether the selection was a directory. Now we explicitly check whether it's a directory. Fixes #1177 --- ranger/core/actions.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ranger/core/actions.py b/ranger/core/actions.py index 6bbb35aa..981df05b 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -483,9 +483,12 @@ class Actions( # pylint: disable=too-many-instance-attributes,too-many-public-m mode = narg tfile = self.thisfile selection = self.thistab.get_selection() - if not self.thistab.enter_dir(tfile) and selection: - result = self.execute_file(selection, mode=mode) - if result in (False, ASK_COMMAND): + if selection: + if selection.is_directory: + self.thistab.enter_dir(tfile) + else: + result = self.execute_file(selection, mode=mode) + if result in (False, ASK_COMMAND): self.open_console('open_with ') elif direction.vertical() and cwd.files: pos_new = direction.move( -- cgit 1.4.1-2-gfad0 From cd4b2df4304071ea1fc1f035058700433a8b1c4a Mon Sep 17 00:00:00 2001 From: Toon Nolten Date: Wed, 16 May 2018 15:39:59 +0200 Subject: Actually check whether selection is a directory `Actions.move()` used `enter_dir()` to determine whether the selection was a directory. Now we explicitly check whether it's a directory. Fixes #1177 --- ranger/core/actions.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ranger/core/actions.py b/ranger/core/actions.py index 6bbb35aa..6ddcdd86 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -483,10 +483,13 @@ class Actions( # pylint: disable=too-many-instance-attributes,too-many-public-m mode = narg tfile = self.thisfile selection = self.thistab.get_selection() - if not self.thistab.enter_dir(tfile) and selection: - result = self.execute_file(selection, mode=mode) - if result in (False, ASK_COMMAND): - self.open_console('open_with ') + if selection: + if selection.is_directory: + self.thistab.enter_dir(tfile) + else: + result = self.execute_file(selection, mode=mode) + if result in (False, ASK_COMMAND): + self.open_console('open_with ') elif direction.vertical() and cwd.files: pos_new = direction.move( direction=direction.down(), -- cgit 1.4.1-2-gfad0