From 71d888ac99ed1981f8e3beae818c1c6b47f713c5 Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Sat, 21 Nov 2009 15:30:21 +0000
Subject: [PATCH] Fixes the legacy media bundle to not throw exceptions on stop
 because its start hasn't registered the MediaService.

---
 .../sip/communicator/impl/media/MediaActivator.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/media/MediaActivator.java b/src/net/java/sip/communicator/impl/media/MediaActivator.java
index 43c3b2ad1..faf2fcf21 100644
--- a/src/net/java/sip/communicator/impl/media/MediaActivator.java
+++ b/src/net/java/sip/communicator/impl/media/MediaActivator.java
@@ -176,8 +176,16 @@ public static BundleContext getBundleContext()
     public void stop(BundleContext context)
         throws Exception
     {
-        mediaServiceImpl.stop();
-        mediaServiceRegistration.unregister();
+        if (mediaServiceImpl != null)
+        {
+            mediaServiceImpl.stop();
+            mediaServiceImpl = null;
+        }
+        if (mediaServiceRegistration != null)
+        {
+            mediaServiceRegistration.unregister();
+            mediaServiceRegistration = null;
+        }
     }
 
 }