about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2013-02-25 04:07:46 +0100
committerhut <hut@lavabit.com>2013-02-25 04:07:46 +0100
commita9ce3aeeb11ee2eb1cc3c3076a0068646476ccdb (patch)
tree6655e85a658fa211deb1b0fc70fff1bf82778c4a
parentda21d3d56862b34f3b15b08f9c7036e61649e055 (diff)
downloadranger-a9ce3aeeb11ee2eb1cc3c3076a0068646476ccdb.tar.gz
config/commands: fix blocking in :scout, remove debug code
-rw-r--r--ranger/config/commands.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/ranger/config/commands.py b/ranger/config/commands.py
index 4f625786..13b2e060 100644
--- a/ranger/config/commands.py
+++ b/ranger/config/commands.py
@@ -1084,12 +1084,12 @@ class scout(Command):
             else:
                 self.fm.move(right=1)
 
-        if self.KEEP_OPEN in flags:
+        if self.KEEP_OPEN in flags and thisdir != self.fm.thisdir:
             # reopen the console:
-            if thisdir != self.fm.thisdir:
-                self.fm.open_console(self.line[0:-len(pattern)])
-                if pattern != "..":
-                    self.fm.block_input(0.5)
+            self.fm.open_console(self.line[0:-len(pattern)])
+
+        if thisdir != self.fm.thisdir and pattern != "..":
+            self.fm.block_input(0.5)
 
     def cancel(self):
         self.fm.thisdir.temporary_filter = None
@@ -1139,8 +1139,6 @@ class scout(Command):
         if self.INVERT in flags:
             regex = "^(?:(?!%s).)*$" % regex
 
-        self.fm.notify("regex: " + str(regex))
-
         # Compile Regular Expression
         options = re.I if self.IGNORE_CASE in flags else 0
         try: