From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 12 Mar 2007 02:51:40 +0000 (+0000)
Subject: Don't crash if active_tips_data is NULL. (#382904, Li Yuan)
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~34271
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aa16f8e09b8a9ba332e2eed2b789e3f6b1e09eae;p=gtk4.git

Don't crash if active_tips_data is NULL. (#382904, Li Yuan)

2007-03-11  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtktooltips.c (gtk_tooltips_get_info_from_tip_window):
        Don't crash if active_tips_data is NULL.  (#382904, Li Yuan)

2

svn path=/trunk/; revision=17483
---

diff --git a/ChangeLog b/ChangeLog
index 746361fa8a..42f2353ee1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktooltips.c (gtk_tooltips_get_info_from_tip_window):
+	Don't crash if active_tips_data is NULL.  (#382904, Li Yuan)
+
 2007-03-11  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktextview.c (gtk_text_view_set_buffer): Set first_para_mark
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index 458f9e4109..bb41f14325 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -779,7 +779,7 @@ gtk_tooltips_get_info_from_tip_window (GtkWindow    *tip_window,
   if (tooltips)
     *tooltips = current_tooltips;
   if (current_widget)
-    *current_widget = has_tips ? current_tooltips->active_tips_data->widget : NULL;
+    *current_widget = (has_tips && current_tooltips->active_tips_data) ? current_tooltips->active_tips_data->widget : NULL;
 
   return has_tips;
 }