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, 3 insertions, 3 deletions

diff --git a/record.py b/record.py
index 2f7bb9a..9b4c184 100755
--- a/record.py
+++ b/record.py
@@ -89,7 +89,7 @@ class Record(activity.Activity):
 
 
 	def read_file(self, file):
-			serialize.fillMediaHash(file, self.m.mediaHashs)
+		serialize.fillMediaHash(file, self.m.mediaHashs)
 
 
 	def write_file(self, file):
@@ -126,9 +126,9 @@ class Record(activity.Activity):
 		self.gplay.stop()
 		self.ui.doMouseListener( False )
 
-		if (self.m.RECORDING):
+		if (self.ui.COUNTINGDOWN or self.m.RECORDING or self.ui.TRANSCODING):
 			self.m.setUpdating( False )
-			self.m.doShutter()
+			self.m.abandonRecording()
 		else:
 			self.glive.stop()