cheese r588 - in trunk: . src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Thu Mar 13 02:08:14 2008
New Revision: 588
URL: http://svn.gnome.org/viewvc/cheese?rev=588&view=rev

Log:
cheese crashes while initializing webcam, does strcmp on NULL, fixes bug #522143, courtesy of Alex Rostovtsev


Modified:
   trunk/ChangeLog
   trunk/src/cheese-webcam.c

Modified: trunk/src/cheese-webcam.c
==============================================================================
--- trunk/src/cheese-webcam.c	(original)
+++ trunk/src/cheese-webcam.c	Thu Mar 13 02:08:14 2008
@@ -579,7 +579,7 @@
     selected_device = 0;
     for (i = 1; i < priv->num_webcam_devices ; i++)
     {
-	if (strcmp (priv->webcam_devices[i].video_device, priv->device_name) == 0)
+	    if (g_strcmp0 (priv->webcam_devices[i].video_device, priv->device_name) == 0)
           selected_device = i;
     }
     CheeseWebcamDevice *selected_webcam = &(priv->webcam_devices[selected_device]);