[gnome-commander/gcmd-1-3] Fixed problem #587325 (crash in a clean chroot environment)
- From: Piotr Eljasiak <epiotr src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-commander/gcmd-1-3] Fixed problem #587325 (crash in a clean chroot environment)
- Date: Thu, 9 Jul 2009 14:54:58 +0000 (UTC)
commit 6b60ff7290a019d2e240054e78890076575bb9eb
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Thu Jul 9 16:54:33 2009 +0200
Fixed problem #587325 (crash in a clean chroot environment)
src/gnome-cmd-bookmark-dialog.cc | 2 +-
src/gnome-cmd-main-menu.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/gnome-cmd-bookmark-dialog.cc b/src/gnome-cmd-bookmark-dialog.cc
index 202c38a..9b87d7b 100644
--- a/src/gnome-cmd-bookmark-dialog.cc
+++ b/src/gnome-cmd-bookmark-dialog.cc
@@ -400,7 +400,7 @@ static void add_bookmarks (GnomeCmdBookmarkDialog *dialog)
GnomeCmdCon *con = (GnomeCmdCon *) all_cons->data;
group = gnome_cmd_con_get_bookmarks (con);
- if (group->bookmarks)
+ if (group && group->bookmarks)
{
group->data = (gpointer *) dialog;
dialog->priv->groups = g_list_append (dialog->priv->groups, group);
diff --git a/src/gnome-cmd-main-menu.cc b/src/gnome-cmd-main-menu.cc
index d00e859..2df8d69 100644
--- a/src/gnome-cmd-main-menu.cc
+++ b/src/gnome-cmd-main-menu.cc
@@ -1014,7 +1014,7 @@ void gnome_cmd_main_menu_update_bookmarks (GnomeCmdMainMenu *main_menu)
GnomeCmdCon *con = GNOME_CMD_CON (cons->data);
GnomeCmdBookmarkGroup *group = gnome_cmd_con_get_bookmarks (con);
GtkMenuShell *bookmarks_menu = GTK_MENU_SHELL (GTK_MENU_ITEM (main_menu->priv->bookmarks_menu)->submenu);
- if (group->bookmarks)
+ if (group && group->bookmarks)
add_bookmark_group (main_menu, bookmarks_menu, group);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]