summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-01-01 23:02:13 +0100
committerhut <hut@lavabit.com>2010-01-01 23:02:13 +0100
commite3093cb0bf9f5cee15d58d59f1a7ecc0ce40e55a (patch)
treeb6d3f326948f328cf3cb9f2bc1c5a35617c04e5f /ranger
parente07cfa317933374e05ca8c4776e2a131724057d8 (diff)
downloadranger-e3093cb0bf9f5cee15d58d59f1a7ecc0ce40e55a.tar.gz
actions: fixed handling of unknown types at move_right
Diffstat (limited to 'ranger')
-rw-r--r--ranger/actions.py5
-rw-r--r--ranger/applications.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/ranger/actions.py b/ranger/actions.py
index f4c13ad2..a4b90647 100644
--- a/ranger/actions.py
+++ b/ranger/actions.py
@@ -4,6 +4,7 @@ import shutil
 from ranger.shared import EnvironmentAware, SettingsAware
 from ranger import fsobject
 from ranger.ext.trim import trimmed_lines_of_docstring
+from ranger.gui.widgets import console_mode as cmode
 
 from ranger.applications import run
 
@@ -149,8 +150,8 @@ class Actions(EnvironmentAware, SettingsAware):
 
 		if not self.env.enter_dir(cf):
 			if sel:
-				if not self.execute_file(sel, mode=mode):
-					self.open_console('@')
+				if self.execute_file(sel, mode=mode) is None:
+					self.open_console(cmode.OPEN_QUICK)
 
 	def history_go(self, relative):
 		"""Move back and forth in the history"""
diff --git a/ranger/applications.py b/ranger/applications.py
index a3e3aeea..c10df6f8 100644
--- a/ranger/applications.py
+++ b/ranger/applications.py
@@ -191,11 +191,12 @@ class AppContext(object):
 		else:
 			self._activate_ui(False)
 			try:
-				p = Popen(**kw)
+				process = Popen(**kw)
 				if self.wait:
-					waitpid_no_intr(p.pid)
+					waitpid_no_intr(process.pid)
 			finally:
 				self._activate_ui(True)
+				return process
 
 	def _activate_ui(self, boolean):
 		if self.fm and self.fm.ui:
r hut <hut@lavabit.com> 2009-12-25 21:55:04 +0100 updated pydoc pages' href='/akspecs/ranger/commit/doc/test.tc_ui.html?h=v1.5.4&id=f07bb12fc5c59430e995a64956b36331ce3629b9'>f07bb12f ^
34a60763 ^
f07bb12f ^





34a60763 ^
f07bb12f ^

34a60763 ^
f07bb12f ^

34a60763 ^
f07bb12f ^
34a60763 ^
f07bb12f ^





34a60763 ^
f07bb12f ^





34a60763 ^
f07bb12f ^

34a60763 ^
f07bb12f ^

34a60763 ^
f07bb12f ^



34a60763 ^
f07bb12f ^
34a60763 ^
f07bb12f ^
34a60763 ^
f07bb12f ^






f07bb12f ^

34a60763 ^
f07bb12f ^
34a60763 ^





f07bb12f ^
34a60763 ^

f07bb12f ^
34a60763 ^
f07bb12f ^
34a60763 ^





f07bb12f ^
34a60763 ^

f07bb12f ^
34a60763 ^





f07bb12f ^




34a60763 ^

f07bb12f ^
34a60763 ^

f07bb12f ^










34a60763 ^
f07bb12f ^


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204