From 6c7c0096bfc548706fed8e9ddd473912e2e0ba44 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 20 Nov 2006 03:29:16 +0000 Subject: [PATCH] 2006-11-19 Don Allingham * src/DbLoader.py: try to catch a None value for default directory svn: r7654 --- gramps2/ChangeLog | 3 +++ gramps2/src/DbLoader.py | 18 +++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 42044bdd5..6aa7b4406 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2006-11-19 Don Allingham + * src/DbLoader.py: try to catch a None value for default directory + 2006-11-19 Brian Matherly * src/ViewManager.py: Fix 0000576: Credits window behind about window diff --git a/gramps2/src/DbLoader.py b/gramps2/src/DbLoader.py index aade65b90..3c150727b 100644 --- a/gramps2/src/DbLoader.py +++ b/gramps2/src/DbLoader.py @@ -482,13 +482,17 @@ class DbLoader: def get_default_dir(): # Suggested folder: try last open file, last import, last export, # then home. - default_dir = os.path.dirname(Config.get(Config.RECENT_FILE)) + os.path.sep - if len(default_dir)<=1: - default_dir = Config.get(Config.RECENT_IMPORT_DIR) - if len(default_dir)<=1: - default_dir = Config.get(Config.RECENT_EXPORT_DIR) - if len(default_dir)<=1: - default_dir = '~/' + default_dir = os.path.dirname(Config.get(Config.RECENT_FILE)) + if default_dir: + default_dir += os.path.sep + if len(default_dir)<=1: + default_dir = Config.get(Config.RECENT_IMPORT_DIR) + if len(default_dir)<=1: + default_dir = Config.get(Config.RECENT_EXPORT_DIR) + if len(default_dir)<=1: + default_dir = '~/' + else: + default_dir = "~/" return default_dir #-------------------------------------------------------------------------