Merge branch 'shape_fixes' of https://github.com/Vajnar/orte

[orte.git] / orte / contrib / shape_android / src / org / ocera / orte / shape_android / PublisherShape.java

diff --git a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherShape.java b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherShape.java
index daf55adb4b988d6e8def4c49403eb16d8d08d06e..212be3f016208255eb5f19ce51e4d76cecb9e81e 100644 (file)
--- a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherShape.java
+++ b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherShape.java
@@ -312,7 +312,10 @@ public class PublisherShape extends ShapeDrawable
         */
        public void killMe()
        {
-               this.publication.destroy();
+               if (this.publication != null) {
+                       this.publication.destroy();
+                       this.publication = null;
+               }
        }
        
        /**