summaryrefslogtreecommitdiff
path: root/settings
diff options
context:
space:
mode:
authorSimon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>2020-11-07 00:12:45 +0100
committerSimon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>2020-11-07 00:12:45 +0100
commita9c18f5de07cf4dadb05b51402bf514009f900b3 (patch)
tree0cb607a91801a0aa0b37ceff5125bf7e6eb15eb4 /settings
parent60a1dd5c1bdd1e7e01167a0033236041beb36800 (diff)
downloadxfce4-session-a9c18f5de07cf4dadb05b51402bf514009f900b3.tar.gz
Add more guards around GErrors
Diffstat (limited to 'settings')
-rw-r--r--settings/main.c8
-rw-r--r--settings/session-editor.c5
2 files changed, 8 insertions, 5 deletions
diff --git a/settings/main.c b/settings/main.c
index 225f7e6e..a1433adb 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -148,9 +148,11 @@ main(int argc,
&error);
if(!builder) {
- xfce_dialog_show_error(NULL, error,
- _("Unable to create user interface from embedded definition data"));
- g_error_free (error);
+ if (error) {
+ xfce_dialog_show_error(NULL, error,
+ _("Unable to create user interface from embedded definition data"));
+ g_error_free (error);
+ }
return EXIT_FAILURE;
}
diff --git a/settings/session-editor.c b/settings/session-editor.c
index fc821576..f72b62b9 100644
--- a/settings/session-editor.c
+++ b/settings/session-editor.c
@@ -137,11 +137,12 @@ session_editor_save_session(GtkWidget *btn,
xfce_message_dialog(GTK_WINDOW(gtk_widget_get_toplevel(btn)),
_("Session Save Error"), "dialog-error",
_("Unable to save the session"),
- error->message,
+ error ? error->message : "Unknown error.",
XFCE_BUTTON_TYPE_MIXED, "window-close-symbolic", _("_Close"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_widget_set_sensitive(btn, TRUE);
- g_error_free(error);
+ if (error)
+ g_error_free(error);
return;
}