diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-08-09 21:15:56 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-08-09 21:18:29 +0200 |
| commit | 8e2886dc6b45b4e3f68d84887f728483fd2d1538 (patch) | |
| tree | e682bbea9e329c80ebc66233d58a01a1306bddbd /grc/gui/ActionHandler.py | |
| parent | cbe1e43b0f0d1ee0d356b7110700400578855ac6 (diff) | |
| parent | fc1a6a88483120921936e415aba4d5d1a9b42d96 (diff) | |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'grc/gui/ActionHandler.py')
| -rw-r--r-- | grc/gui/ActionHandler.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py index 9e57565772..ca16a7e7fd 100644 --- a/grc/gui/ActionHandler.py +++ b/grc/gui/ActionHandler.py @@ -63,7 +63,7 @@ class ActionHandler: Messages.register_messenger(self.main_window.add_console_line) Messages.send_init(platform) #initialize - self.init_file_paths = file_paths + self.init_file_paths = [os.path.abspath(file_path) for file_path in file_paths] self.init = False Actions.APPLICATION_INITIALIZE() @@ -112,14 +112,11 @@ class ActionHandler: # Initialize/Quit ################################################## if action == Actions.APPLICATION_INITIALIZE: - if not self.init_file_paths: - self.init_file_paths = list(filter(os.path.exists, Preferences.get_open_files())) - if not self.init_file_paths: self.init_file_paths = [''] - for file_path in self.init_file_paths: - if file_path: main.new_page(file_path) #load pages from file paths - if Preferences.file_open() in self.init_file_paths: - main.new_page(Preferences.file_open(), show=True) - if not self.main_window.current_page: + file_path_to_show = Preferences.file_open() + for file_path in (self.init_file_paths or Preferences.get_open_files()): + if os.path.exists(file_path): + main.new_page(file_path, show=file_path_to_show == file_path) + if not main.current_page: main.new_page() # ensure that at least a blank page exists main.btwin.search_entry.hide() |