From e7f8cb8acc3d72df3a0ac5102004a9a33f6bbd63 Mon Sep 17 00:00:00 2001 From: H.G.Muller Date: Sat, 12 Mar 2016 23:32:00 +0100 Subject: [PATCH] Make help clicks resistent to NULL-pointer Label names This should be needed, but just in case... --- gtk/xoptions.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/xoptions.c b/gtk/xoptions.c index e796d7f..9e27c7e 100644 --- a/gtk/xoptions.c +++ b/gtk/xoptions.c @@ -1486,14 +1486,14 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width); label = frame; } gtk_widget_set_size_request(label, option[i].max ? option[i].max : -1, -1); - if(option[i].target || dlgNr != ErrorDlg &&!strchr(option[i].name, '\n')) { // allow user to specify event handler for button presses + if(option[i].target || dlgNr != ErrorDlg && option[i].name && !strchr(option[i].name, '\n')) { // allow user to specify event handler for button presses button = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(button), label); label = button; gtk_widget_add_events(GTK_WIDGET(label), GDK_BUTTON_PRESS_MASK); if(option[i].target) g_signal_connect(label, "button-press-event", G_CALLBACK(MemoEvent), (gpointer) &option[i]); - else g_signal_connect(label, "button-press-event", G_CALLBACK(HelpEvent), (gpointer) option[i].name); +// else g_signal_connect(label, "button-press-event", G_CALLBACK(HelpEvent), (gpointer) option[i].name); gtk_widget_set_sensitive(label, TRUE); } Pack(hbox, table, label, left, left+r, top, 0); -- 1.7.0.4