[gtk/wip/baedert/for-master: 56/56] shortcutcontroller: Check for NULL GtkNative of widget



commit d328374c9446dfc8cf2c63cfc01908c0320bb792
Author: Timm Bäder <mail baedert org>
Date:   Thu Apr 30 11:03:14 2020 +0200

    shortcutcontroller: Check for NULL GtkNative of widget
    
    And just continue in that case.

 gtk/gtkshortcutcontroller.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkshortcutcontroller.c b/gtk/gtkshortcutcontroller.c
index 33199ee5d6..99fa997b76 100644
--- a/gtk/gtkshortcutcontroller.c
+++ b/gtk/gtkshortcutcontroller.c
@@ -342,10 +342,16 @@ gtk_shortcut_controller_run_controllers (GtkEventController *controller,
             widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (model));
         }
 
+      if (!_gtk_widget_is_sensitive (widget) ||
+          !_gtk_widget_get_mapped (widget))
+        {
+          g_object_unref (shortcut);
+          continue;
+        }
+
       native = gtk_widget_get_native (widget);
-      if (!gtk_widget_is_sensitive (widget) ||
-          !gtk_widget_get_mapped (widget) ||
-          !gdk_surface_is_viewable (gtk_native_get_surface (native)))
+      if (!native ||
+          !gdk_surface_is_viewable(gtk_native_get_surface (native)))
         {
           g_object_unref (shortcut);
           continue;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]