Add check for stylus detection (#70)

* Add check for stylus detection * Evaluate Boolean directly * Update metainfo with a description of the fix * Use issues tag in metainfo * Update issue titile
elementary · Dec 17, 2024 · 45a453b · 45a453b
1 parent db18e22
commit 45a453b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/data/wacom.metainfo.xml.in b/data/wacom.metainfo.xml.in
@@ -31,6 +31,18 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
+    <release version="8.0.1" date="2024-12-17" urgency="medium">
+      <description>
+        <p>Updates:</p>
+        <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/switchboard-plug-wacom/issues/69">Clicking on the Wacom plug crushes Settings, because stylus is not detected by libwacom</issue>
+      </issues>
+    </release>
+
     <release version="8.0.0" date="2024-07-02" urgency="medium">
       <description>
         <p>A Big Redesign!</p>

diff --git a/src/MainPage.vala b/src/MainPage.vala
@@ -96,7 +96,7 @@ public class Wacom.MainPage : Switchboard.SettingsPage {
             return;
         }
 
-        if (tools.size > 0) {
+        if (tools.size > 0 && stylus_view.is_stylus_supported (tools[0])) {
             stylus_view.set_device (tools[0]);
             stylus_stack.visible_child = stylus_view;
         }
@@ -131,8 +131,10 @@ public class Wacom.MainPage : Switchboard.SettingsPage {
         }
 
         if (wacom_tool != last_stylus) {
-            stylus_view.set_device (wacom_tool);
-            stylus_stack.visible_child = stylus_view;
+            if (stylus_view.is_stylus_supported (wacom_tool)) {
+                stylus_view.set_device (wacom_tool);
+                stylus_stack.visible_child = stylus_view;
+            }
         }
 
         last_stylus = wacom_tool;

diff --git a/src/Views/StylusView.vala b/src/Views/StylusView.vala
@@ -31,6 +31,11 @@ public class Wacom.StylusView : Gtk.Box {
         append (stylus_box);
     }
 
+    public bool is_stylus_supported (Backend.WacomTool wacom_tool) {
+        unowned var stylus = wacom_db.get_stylus_for_id ((int) wacom_tool.id);
+        return stylus != null;
+    }
+
     public void set_device (Backend.WacomTool wacom_tool) {
         while (stylus_box.get_first_child () != null) {
             stylus_box.remove (stylus_box.get_first_child ());