Author: jannis Date: 2008-06-22 01:50:16 +0000 (Sun, 22 Jun 2008) New Revision: 27121
Modified: xfce4-mixer/trunk/ChangeLog xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c Log: * xfce4-mixer/xfce-mixer-track.c: Fix crash when moving the fader of a mixer track with only one channel (which was caused by accessing the unitialized track->lock_button variable). Modified: xfce4-mixer/trunk/ChangeLog =================================================================== --- xfce4-mixer/trunk/ChangeLog 2008-06-22 01:34:11 UTC (rev 27120) +++ xfce4-mixer/trunk/ChangeLog 2008-06-22 01:50:16 UTC (rev 27121) @@ -1,5 +1,12 @@ 2008-06-22 Jannis Pohlmann <[EMAIL PROTECTED]> + * xfce4-mixer/xfce-mixer-track.c: Fix crash when moving the + fader of a mixer track with only one channel (which was + caused by accessing the unitialized track->lock_button + variable). + +2008-06-22 Jannis Pohlmann <[EMAIL PROTECTED]> + * xfce4-mixer/xfce-mixer-track.{c,h}, xfce4-mixer/xfce-mixer-option.{c,h}, xfce4-mixer/xfce-mixer-switch.{c,h}, Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c =================================================================== --- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c 2008-06-22 01:34:11 UTC (rev 27120) +++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c 2008-06-22 01:50:16 UTC (rev 27121) @@ -301,8 +301,8 @@ for (iter = track->channel_faders, channel = 0; iter != NULL; iter = g_list_next (iter), ++channel) { /* If the channels are bound together, apply the volume to all the others */ - if (G_LIKELY (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (track->lock_button)))) - gtk_range_set_value (GTK_RANGE (iter->data), gtk_range_get_value (range)); + if (G_LIKELY (track->gst_track->num_channels >= 2 && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (track->lock_button)))) + gtk_range_set_value (GTK_RANGE (iter->data), gtk_range_get_value (range)); volumes[channel] = (gint) gtk_range_get_value (GTK_RANGE (iter->data)); } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits