pitivi r1314 - in trunk: . pitivi

[edwardrv svn gnome org]

Author: edwardrv
Date: Sat Oct 11 11:30:51 2008
New Revision: 1314
URL: http://svn.gnome.org/viewvc/pitivi?rev=1314&view=rev

Log:
	patch by: Michael Terry <mike mterry name>
	* pitivi/bin.py:
	Fix issue when cancelling rendering.
	Fixes #458944

Modified:
   trunk/ChangeLog
   trunk/pitivi/bin.py

Modified: trunk/pitivi/bin.py
==============================================================================
--- trunk/pitivi/bin.py	(original)
+++ trunk/pitivi/bin.py	Sat Oct 11 11:30:51 2008
@@ -231,12 +231,12 @@
         self.set_state(gst.STATE_PAUSED)
 
         if self.encthread:
+            self.encthread.set_state(gst.STATE_NULL)
             apad = self.encthread.get_pad("vsink")
             apad.get_peer().unlink(apad)
             apad = self.encthread.get_pad("asink")
             apad.get_peer().unlink(apad)
             self.remove(self.encthread)
-            self.encthread.set_state(gst.STATE_NULL)
             del self.encthread
             self.encthread = None
             if self.tmpasink: