Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Sun, 13 Jan 2013 16:57:02 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 13 Jan 2013 16:57:02 +0100
- changeset 2338
- aadd0d5635c1
- parent 2337
- ba67938138b9 (diff)
- parent 2336
- d9e47b8ee1ef (current diff)
- child 2339
- 4ee173db22c2
Merged remote changes.
--- a/MultiProject/MultiProject.py Sun Jan 13 12:58:08 2013 +0100 +++ b/MultiProject/MultiProject.py Sun Jan 13 16:57:02 2013 +0100 @@ -268,8 +268,10 @@ @param startdir start directory for the selection dialog (string) """ - if startdir is None: + if not startdir: startdir = self.ppath + if not startdir: + startdir = Preferences.getMultiProject("Workspace") dlg = AddProjectDialog(self.ui, startdir=startdir) if dlg.exec_() == QDialog.Accepted: name, filename, isMaster, description = dlg.getData()
