aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell.c
diff options
context:
space:
mode:
Diffstat (limited to 'shell/e-shell.c')
-rw-r--r--shell/e-shell.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 2962824126..6de1b38912 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -497,7 +497,7 @@ impl_Shell_selectUserFolder (PortableServer_Servant servant,
parent_wm_hints = XGetWMHints (GDK_DISPLAY (), (Window) parent_xid);
- if (parent_wm_hints->flags & WindowGroupHint) {
+ if (parent_wm_hints != NULL && (parent_wm_hints->flags & WindowGroupHint)) {
XWMHints *wm_hints;
wm_hints = XAllocWMHints ();
@@ -505,9 +505,8 @@ impl_Shell_selectUserFolder (PortableServer_Servant servant,
wm_hints->window_group = parent_wm_hints->window_group;
XSetWMHints (GDK_DISPLAY (), GDK_WINDOW_XWINDOW (folder_selection_dialog->window), wm_hints);
XFree (wm_hints);
+ XFree (parent_wm_hints);
}
-
- XFree (parent_wm_hints);
}
}