Changeset 7f1098c for server/lib/gutenbach/server/job.py

Timestamp:

Jan 21, 2012, 6:24:36 PM (12 years ago)

Author:

Daniel Cooper <danny@…>

Branches:

no-cups

Children:

6c60b2e

Parents:

279640c (diff), bd5bffc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Daniel Cooper <danny@…> (01/21/12 18:24:36)

git-committer:

Daniel Cooper <danny@…> (01/21/12 18:24:36)

Message:

Merge branch 'no-cups' of github.com:jhamrick/gutenbach into no-cups

File:

• server/lib/gutenbach/server/job.py (modified) (1 diff)

server/lib/gutenbach/server/job.py

@@ -56 +56 @@
     def __del__(self):
         if self.player:
-            self.player.mplayer_stop()
+            if self.player.is_playing:
+                self.player.mplayer_stop()
+            if self.player.fh:
+                if self.player.fh.closed:
+                    self.player.fh.close()
             self.player = None
-        if self.document and not self.document.closed:
-            self.document.close()
-            self.document = None
-
+
+        self.document = None
         self.id = None
         self.creator = None