# HG changeset patch
# User nadvornik
# Date 1241725958 0
# Node ID 9e2111452988aa4912865275296b4cb63fba1948
# Parent  3fbec0e63e6b181bc170375607f65ebbda9240dd
fixed keyword tree initialization

diff -r 3fbec0e63e6b -r 9e2111452988 src/bar_keywords.c
--- a/src/bar_keywords.c	Thu May 07 19:38:07 2009 +0000
+++ b/src/bar_keywords.c	Thu May 07 19:52:38 2009 +0000
@@ -1224,6 +1224,7 @@
 	GtkTreeModel *store;
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
+	GtkTreeIter iter;
 
 	pkd = g_new0(PaneKeywordsData, 1);
 
@@ -1273,7 +1274,11 @@
 	gtk_widget_show(scrolled);
 
 
-	if (!keyword_tree) keyword_tree_new_default();
+	if (!keyword_tree || !gtk_tree_model_get_iter_first(GTK_TREE_MODEL(keyword_tree), &iter))
+		{
+		/* keyword tree does not exist or is empty - fill with defaults */
+		keyword_tree_new_default();
+		}
 
 	store = gtk_tree_model_filter_new(GTK_TREE_MODEL(keyword_tree), NULL);
 
diff -r 3fbec0e63e6b -r 9e2111452988 src/metadata.c
--- a/src/metadata.c	Thu May 07 19:38:07 2009 +0000
+++ b/src/metadata.c	Thu May 07 19:52:38 2009 +0000
@@ -1333,11 +1333,9 @@
 
 void keyword_tree_new_default(void)
 {
-	if (keyword_tree) return;
-	
-	keyword_tree_new();
+	GtkTreeIter i1, i2, i3;
 
-	GtkTreeIter i1, i2, i3;
+	if (!keyword_tree) keyword_tree_new();
 
 	i1 = keyword_tree_default_append(keyword_tree, NULL, _("People"), TRUE); 
 		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Family"), TRUE);