From 8293226c5f1e10318d08ca891da4f8560a0f851a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 24 Aug 2009 10:56:04 -0600 Subject: [PATCH] Fix bug in OS X and Windows where instead of remebering previously selected directory, the parent directory would be remembered instead --- src/calibre/gui2/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index eb93602fd1..8564fda328 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -450,12 +450,13 @@ class FileDialog(QObject): if os.path.exists(f): self.selected_files.append(f) if self.selected_files: - self.selected_files = [qstring_to_unicode(q) for q in self.selected_files] - dynamic[self.dialog_name] = os.path.dirname(self.selected_files[0]) + self.selected_files = [unicode(q) for q in self.selected_files] + saved_loc = self.selected_files[0] + if os.path.isfile(saved_loc): + saved_loc = os.path.dirname(saved_loc) + dynamic[self.dialog_name] = saved_loc self.accepted = bool(self.selected_files) - - def get_files(self): if islinux and self.fd.result() != self.fd.Accepted: return tuple()