rtsp-client: do not destroy the rtsp watch

Don't destroy the client watch while dispatching.  The rtsp watch is
automatically destroyed after the rtsp watch function closed() has
been called.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=685220

diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c
index 81b5bd8..3e30084 100644 (file)
--- a/gst/rtsp-server/rtsp-client.c
+++ b/gst/rtsp-server/rtsp-client.c
@@ -202,6 +202,9 @@ gst_rtsp_client_finalize (GObject * obj)
 
   GST_INFO ("finalize client %p", client);
 
+  if (client->watchid)
+    g_source_destroy ((GSource *) client->watch);
+
   client_cleanup_sessions (client);
 
   gst_rtsp_connection_free (client->connection);
@@ -536,11 +539,6 @@ close_connection (GstRTSPClient * client)
   }
 
   gst_rtsp_connection_close (client->connection);
-  if (client->watchid) {
-    g_source_destroy ((GSource *) client->watch);
-    client->watchid = 0;
-    client->watch = NULL;
-  }
 }
 
 static gboolean
@@ -1942,11 +1940,6 @@ tunnel_complete (GstRTSPWatch * watch, gpointer user_data)
   gst_rtsp_watch_reset (oclient->watch);
   g_object_unref (oclient);
 
-  /* we don't need this watch anymore */
-  g_source_destroy ((GSource *) client->watch);
-  client->watchid = 0;
-  client->watch = NULL;
-
   return GST_RTSP_OK;
 
   /* ERRORS */