diff options
Diffstat (limited to 'shell/e-shell.c')
| -rw-r--r-- | shell/e-shell.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 1b3dcbbde8..a27c3cb42b 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -822,6 +822,12 @@ e_shell_construct (EShell *shell, if (BONOBO_EX (&ev) || priv->db == CORBA_OBJECT_NIL) { g_warning ("Cannot access Bonobo/ConfigDatabase on wombat:"); + + /* Make sure the DB object is NIL so we don't mess up + (`bonobo_get_object()' might return an undefined value in + the case of an exception). */ + priv->db = CORBA_OBJECT_NIL; + CORBA_exception_free (&ev); return FALSE; } |