summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-10-12 05:05:20 +0200
committerhut <hut@lavabit.com>2010-10-12 05:05:20 +0200
commit62ad65aa01a313620ca3f6c63c134b7805ecce37 (patch)
tree2c090585d9c94bc41357d695c34746accadd95b9 /ranger
parent7137526a07bf98671a8398a2bc987cbd5623f676 (diff)
parent166398d4ba1527d6d0d59f000dee42071b4eabde (diff)
downloadranger-62ad65aa01a313620ca3f6c63c134b7805ecce37.tar.gz
Merge branch 'master' into cp+preview
Diffstat (limited to 'ranger')
-rw-r--r--ranger/core/main.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ranger/core/main.py b/ranger/core/main.py
index 19e28db3..f5aba47e 100644
--- a/ranger/core/main.py
+++ b/ranger/core/main.py
@@ -68,14 +68,14 @@ def main():
 	crash_traceback = None
 	try:
 		# Initialize objects
-		EnvironmentAware.env = Environment(target)
 		fm = FM()
+		FileManagerAware.fm = fm
+		EnvironmentAware.env = Environment(target)
 		fm.tabs = dict((n+1, os.path.abspath(path)) for n, path \
 				in enumerate(targets[:9]))
 		load_settings(fm, arg.clean)
 		if fm.env.username == 'root':
 			fm.settings.preview_files = False
-		FileManagerAware.fm = fm
 		fm.ui = UI()
 		if not arg.debug:
 			curses_interrupt_handler.install_interrupt_handler()