gnome-media r4045 - in trunk/gnome-volume-control: . src

[mccann svn gnome org]

Author: mccann
Date: Tue Nov 11 03:03:57 2008
New Revision: 4045
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4045&view=rev

Log:
2008-11-10  William Jon McCann  <jmccann redhat com>

	* src/gvc-mixer-dialog.c (add_stream),
	(gvc_mixer_dialog_constructor):



Modified:
   trunk/gnome-volume-control/ChangeLog
   trunk/gnome-volume-control/src/gvc-mixer-dialog.c

Modified: trunk/gnome-volume-control/src/gvc-mixer-dialog.c
==============================================================================
--- trunk/gnome-volume-control/src/gvc-mixer-dialog.c	(original)
+++ trunk/gnome-volume-control/src/gvc-mixer-dialog.c	Tue Nov 11 03:03:57 2008
@@ -243,6 +243,8 @@
         GtkAdjustment *adj;
         gboolean       is_muted;
 
+        g_assert (stream != NULL);
+
         bar = gvc_channel_bar_new ();
         gvc_channel_bar_set_size_group (GVC_CHANNEL_BAR (bar),
                                         dialog->priv->size_group);
@@ -583,13 +585,19 @@
                           self);
 
         stream = gvc_mixer_control_get_default_sink (self->priv->mixer_control);
-        add_stream (self, stream);
+        if (stream != NULL) {
+                add_stream (self, stream);
+        }
 
         stream = gvc_mixer_control_get_default_source (self->priv->mixer_control);
-        add_stream (self, stream);
+        if (stream != NULL) {
+                add_stream (self, stream);
+        }
 
         stream = gvc_mixer_control_get_event_sink_input (self->priv->mixer_control);
-        add_stream (self, stream);
+        if (stream != NULL) {
+                add_stream (self, stream);
+        }
 
         streams = gvc_mixer_control_get_sink_inputs (self->priv->mixer_control);
         for (l = streams; l != NULL; l = l->next) {