msmith - in flumotion/branches/platform-3: . flumotion/manager

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Fri Jun 15 11:33:45 2007
New Revision: 5185

Modified:
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/flumotion/manager/component.py
Log:
        * flumotion/manager/component.py:
          Don't try to detach unattached avatars; that doesn't work.



Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Fri Jun 15 11:33:45 2007
@@ -1,3 +1,8 @@
+2007-06-15  Michael Smith <msmith at fluendo.com>
+
+	* flumotion/manager/component.py:
+	  Don't try to detach unattached avatars; that doesn't work.
+
 2007-06-14  Michael Smith <msmith at fluendo.com>
 
 	* flumotion/component/producers/playlist/playlist.py:

Modified: flumotion/branches/platform-3/flumotion/manager/component.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/manager/component.py	(original)
+++ flumotion/branches/platform-3/flumotion/manager/component.py	Fri Jun 15 11:33:45 2007
@@ -175,6 +175,11 @@
         return d
 
     def detached(self, mind):
+        if not self.componentState:
+            # Not attached, so don't detach
+            self.warning("Asked to detach unattached avatar, ignoring")
+            return
+
         # doc in base class
         self.vishnu.unregisterComponent(self)
         self.heaven.unregisterComponent(self)