[pitivi] project: Bring back the essence of commit 88dc015ef for loadProject



commit cd3542ca2c638273ef3559649beea5b6f90d31f2
Author: Jean-François Fortin Tam <nekohayo gmail com>
Date:   Sun Aug 25 11:36:06 2013 -0400

    project: Bring back the essence of commit 88dc015ef for loadProject
    
    Commit 267dd141 moved newBlankProject out of the else clause by mistake,
    which turned it into a portion of code that would never be run.

 pitivi/project.py |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/project.py b/pitivi/project.py
index 3d71ff1..a7bdf89 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -166,20 +166,19 @@ class ProjectManager(Signallable, Loggable):
 
         self.current.connect("missing-uri", self._missingURICb)
         self.current.connect("loaded", self._projectLoadedCb)
+
         if self.current.createTimeline():
             self.emit("new-project-created", self.current)
             self.current.connect("project-changed", self._projectChangedCb)
-            return
+            return True
         else:
             self.emit("new-project-failed", uri,
                       _('This might be due to a bug or an unsupported project file format. '
                       'If you were trying to add a media file to your project, '
                       'use the "Import" button instead.'))
-            return
-
-        # Reset projectManager and disconnect all the signals:
-        self.newBlankProject()
-        return False
+            # Reset projectManager and disconnect all the signals:
+            self.newBlankProject()
+            return False
 
     def _restoreFromBackupDialog(self, time_diff):
         """


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]