switching media fixes much more robust

git-svn-id: http://mediamods.com/public-svn/camera-activity/tags/50@1006 574bc980-5f2d-0410-acbc-c8f9f0eb14e0

1 files changed, 15 insertions, 2 deletions

diff --git a/model.py b/model.py
index ade2626..586774f 100644
--- a/model.py
+++ b/model.py
@@ -296,10 +296,10 @@ class Model:
 		#prep the ui for your return
 		self.ca.ui.LAST_MODE = -1
 		self.ca.ui.TRANSCODING = False
-		self.ca.ui.updateVideoComponents()
 
 		#resume live video from the camera (if the activity is active)
-		if (self.ca.props.active):
+		if (self.ca.ui.ACTIVE):
+			self.ca.ui.updateVideoComponents()
 			self.ca.glive.play()
 
 		self.ca.ui.progressWindow.updateProgress( 0, "" )
@@ -307,6 +307,19 @@ class Model:
 		self.setUpdating( False )
 
 
+	def abandonRecording( self ):
+
+		self.ca.ui.LAST_MODE = -1
+		self.ca.ui.TRANSCODING = False
+		self.ca.ui.completeTimer()
+		self.ca.ui.completeCountdown()
+		self.setRecording(False)
+
+		self.ca.ui.progressWindow.updateProgress( 0, "" )
+
+		self.ca.glive.abandonMedia()
+
+
 	def stoppedRecordingVideo( self ):
 		self.setUpdating( False )