Bug#675342: gnome-settings-daemon - Assertion in wacom-plugin: (device->priv->styli)

[Bastian Blank]

Patch attached.

Bastian

-- 
First study the enemy.  Seek weakness.
		-- Romulan Commander, "Balance of Terror", stardate 1709.2
-------------- next part --------------
--- a/plugins/wacom/gsd-wacom-device.c
+++ b/plugins/wacom/gsd-wacom-device.c
@@ -1484,14 +1487,17 @@
 		}
 	}
 
-	g_warning ("Could not set the current stylus ID 0x%x for tablet '%s', no general pen found",
-		   stylus_id, device->priv->name);
-
 	/* Setting the default stylus to be the first one */
-	g_assert (device->priv->styli);
+	if (device->priv->styli) {
+		g_warning ("Could not set the current stylus ID 0x%x for tablet '%s', no general pen found",
+			   stylus_id, device->priv->name);
 
-	stylus = device->priv->styli->data;
-	g_object_set (device, "last-stylus", stylus, NULL);
+		stylus = device->priv->styli->data;
+		g_object_set (device, "last-stylus", stylus, NULL);
+	}
+	else
+		g_warning ("Could not set the current stylus ID 0x%x for tablet '%s', no pen found",
+			   stylus_id, device->priv->name);
 }
 
 GsdWacomDeviceType