[pitivi/ges: 270/287] project: Do not try to save backup files for closed projects
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/ges: 270/287] project: Do not try to save backup files for closed projects
- Date: Thu, 15 Mar 2012 16:48:34 +0000 (UTC)
commit d09bc60378023cf40e51c8ac4bd956ad3d2ad374
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date: Sun Feb 12 18:32:34 2012 -0500
project: Do not try to save backup files for closed projects
pitivi/project.py | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/pitivi/project.py b/pitivi/project.py
index a3e255e..78138b7 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -249,8 +249,17 @@ class ProjectManager(Signallable, Loggable):
"""
if formatter is None:
formatter = ges.PitiviFormatter()
-
- if uri is None:
+ if backup:
+ if project.uri and self.current.uri is not None:
+ # Ignore whatever URI that is passed on to us. It's a trap.
+ uri = self._makeBackupURI(project.uri)
+ else:
+ # Do not try to save backup files for blank projects.
+ # It is possible that self.current.uri == None when the backup
+ # timer sent us an old instance of the (now closed) project.
+ return
+ elif uri is None:
+ # This allows calling saveProject without specifying the target URI
uri = project.uri
else:
# Ensure the URI we are given is properly encoded, or GIO will fail
@@ -361,13 +370,11 @@ class ProjectManager(Signallable, Loggable):
self.backup_lock += 5
def _saveBackupCb(self, project, uri):
- backup_uri = self._makeBackupURI(uri)
-
if self.backup_lock > 10:
self.backup_lock -= 5
return True
else:
- self.saveProject(project, backup_uri, overwrite=True, backup=True)
+ self.saveProject(project, overwrite=True, backup=True)
self.backup_lock = 0
return False
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]