aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/main.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2b23c12358..81f7c0e9ec 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,10 @@
2001-10-05 Ettore Perazzoli <ettore@ximian.com>
+ * main.c (idle_cb): Do not invoke
+ `e_shell_restore_from_settings()' if `shell' is NULL.
+
+2001-10-05 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-view.c (e_shell_view_save_settings): Get the right
hpaned positions for when the shortcut bar and/or the folder bar
are visible.
diff --git a/shell/main.c b/shell/main.c
index 5260ea5696..7ceac7e537 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -260,7 +260,7 @@ idle_cb (void *data)
}
if (! have_evolution_uri) {
- if (! e_shell_restore_from_settings (shell)) {
+ if (shell == NULL || ! e_shell_restore_from_settings (shell)) {
const char *uri;
uri = E_SHELL_VIEW_DEFAULT_URI;