final fixes to switching media

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

2 files changed, 5 insertions, 0 deletions

diff --git a/record.py b/record.py
index 9b4c184..c208fdc 100755
--- a/record.py
+++ b/record.py
@@ -367,6 +367,8 @@ class Record(activity.Activity):
 	def _meshCheckOnRecdRequest( self, recdRequesting ):
 		self.__class__.log.debug('_meshCheckOnRecdRequest')
 
+		#todo: add category for "not active activity, so go ahead and delete"
+
 		if (recdRequesting.downloadedFromBuddy):
 			self.__class__.log.debug('_meshCheckOnRecdRequest: recdRequesting.downloadedFromBuddy')
 			if (recdRequesting.meshReqCallbackId != 0):
diff --git a/ui.py b/ui.py
index 8ff2913..e75f712 100644
--- a/ui.py
+++ b/ui.py
@@ -342,11 +342,13 @@ class UI:
 

 

 	def finalSetUp( self ):

+		print("finalSetUp")

 		self.LAUNCHING = False

 		self.ACTIVE = self.ca.get_property( "visible" )

 		self.updateVideoComponents()

 

 		if (self.ACTIVE):

+			print("finalSetUp 2, active!")

 			self.ca.glive.play()

 

 

@@ -459,6 +461,7 @@ class UI:
 					if (    self.LIVEMODE and widget == self.playLiveWindow):

 						temp_ACTIVE = False

 

+

 		if (temp_ACTIVE != self.ACTIVE):

 			self.ACTIVE = temp_ACTIVE

 			if (self.ACTIVE):