From 2bcdc69ce55dcd4de195a961def85c0cb5d7102e Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Tue, 15 Jan 2008 09:21:13 +0000 Subject: [PATCH] 2008-01-15 Benny Malengier * src/ArgHandler.py: on autoload, do some extra checks first. svn: r9813 --- ChangeLog | 3 +++ src/ArgHandler.py | 15 +++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index c19d1b6f7..a7c1457f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2008-01-15 Benny Malengier + * src/ArgHandler.py: on autoload, do some extra checks first. + 2008-01-15 Raphael Ackermann * src/GrampsDbUtils/_GrampsDbWriteXML.py * src/GrampsDbUtils/_WriteGedcom.py diff --git a/src/ArgHandler.py b/src/ArgHandler.py index 47e164da9..ac74c2a36 100644 --- a/src/ArgHandler.py +++ b/src/ArgHandler.py @@ -451,16 +451,11 @@ class ArgHandler: elif Config.get(Config.RECENT_FILE) and Config.get(Config.AUTOLOAD): filename = Config.get(Config.RECENT_FILE) - self.vm.db_loader.read_file(filename) - return (filename, const.APP_FAMTREE) - - #if os.path.isfile(rf): - # filetype = Mime.get_type(rf) - # self.vm.read_recent_file(rf, filetype) - #elif os.path.isdir(rf): - # if os.path.isfile(os.path.join(rf, "name.txt")) and \ - # not os.path.isfile(os.path.join(rf,"need_recover")): - # self.vm.read_recent_file(rf, 'x-directory/normal') + if os.path.isdir(filename) and \ + os.path.isfile(os.path.join(filename, "name.txt")) and \ + not os.path.isfile(os.path.join(filename, "need_recover")): + self.vm.db_loader.read_file(filename) + return (filename, const.APP_FAMTREE) #------------------------------------------------------------------------- #