1 files changed, 4 insertions, 12 deletions

diff --git a/device.c b/device.c
index 99dd2a5f..7d996083 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c,v 1.87 2009-08-07 12:33:51 phintuka Exp $
+ * $Id: device.c,v 1.88 2009-08-18 12:26:11 phintuka Exp $
  *
  */
 
@@ -303,15 +303,11 @@ void cXinelibDevice::StopDevice(void)
   if(local)  m_clients.Del(local,  false);
   if(server) m_clients.Del(server, false);
 
-  if(server) {
-    server->Stop();
+  if(server)
     delete server;
-  }
-  if(local) {
-    local->Stop();
+  if(local)
     delete local;
-  }
- 
+
   m_clients.Clear();
 }
 
@@ -478,8 +474,6 @@ void cXinelibDevice::ConfigureWindow(int fullscreen, int width, int height,
     m_clients.Del(tmp, false);
     m_local = NULL;
     cCondWait::SleepMs(5);
-    tmp->Stop();
-    cCondWait::SleepMs(5);
     delete tmp;
     if(xc.force_primary_device)
       ForcePrimaryDevice(false);
@@ -541,8 +535,6 @@ void cXinelibDevice::Listen(bool activate, int port)
     m_clients.Del(tmp, false);
     m_server = NULL;
     cCondWait::SleepMs(5);
-    tmp->Stop();
-    cCondWait::SleepMs(5);
     delete tmp;
   }
 }