From 17de4e31fbbbc0461145ef64ddf50260248f5590 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sat, 25 Nov 2017 11:00:31 -0800 Subject: [PATCH] Avoid using NULL GtkSettings pointer Seems to happen when running tests --- src/gtk/settings.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index afe2368633..fbbbca5974 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -1036,10 +1036,13 @@ void wxSystemSettingsModule::OnExit() { #ifdef __WXGTK3__ GtkSettings* settings = gtk_settings_get_default(); - g_signal_handlers_disconnect_by_func(settings, - (void*)notify_gtk_theme_name, NULL); - g_signal_handlers_disconnect_by_func(settings, - (void*)notify_gtk_font_name, NULL); + if (settings) + { + g_signal_handlers_disconnect_by_func(settings, + (void*)notify_gtk_theme_name, NULL); + g_signal_handlers_disconnect_by_func(settings, + (void*)notify_gtk_font_name, NULL); + } #else if (gs_tlw_parent) {