[farsight2/master] msnsession: Only try to lock conference if it has been set

[Olivier Crête]

---
 gst/fsmsnconference/fs-msn-session.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gst/fsmsnconference/fs-msn-session.c b/gst/fsmsnconference/fs-msn-session.c
index c1be018..167156e 100644
--- a/gst/fsmsnconference/fs-msn-session.c
+++ b/gst/fsmsnconference/fs-msn-session.c
@@ -354,11 +354,13 @@ fs_msn_session_set_property (GObject *object,
       self->priv->conference = FS_MSN_CONFERENCE (g_value_dup_object (value));
       break;
     case PROP_TOS:
-      GST_OBJECT_LOCK (conference);
+      if (conference)
+        GST_OBJECT_LOCK (conference);
       self->priv->tos = g_value_get_uint (value);
       if (self->priv->stream)
         fs_msn_stream_set_tos_locked (self->priv->stream, self->priv->tos);
-      GST_OBJECT_UNLOCK (conference);
+      if (conference)
+        GST_OBJECT_UNLOCK (conference);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-- 
1.5.6.5