]> git.0d.be Git - empathy.git/commitdiff
CallWindow: don't spit unnecessary criticals
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Tue, 30 Aug 2011 09:37:29 +0000 (10:37 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Tue, 30 Aug 2011 09:46:10 +0000 (10:46 +0100)
There's no guarantee that an actor has an allocation all the time,
so gracefully handle the case when it doesn't.

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

src/empathy-call-window.c

index 0fd81ee04284d0b0c29fbc40e782d3648a93836c..dac9b6462c2f5640488d5ad25d6ba147f9ca0680 100644 (file)
@@ -707,8 +707,8 @@ empathy_call_window_get_preview_position (EmpathyCallWindow *self,
   ClutterGeometry box;
   PreviewPosition pos = PREVIEW_POS_NONE;
 
-  g_return_val_if_fail (clutter_actor_has_allocation (self->priv->video_box),
-      pos);
+  if (!clutter_actor_has_allocation (self->priv->video_box))
+    return pos;
 
   clutter_actor_get_geometry (self->priv->video_box, &box);