Fixes #1272: crash on moving feed into new folder

lwindolf · Aug 2, 2023 · 1981d49 · 1981d49
1 parent 3acb5bc
commit 1981d49
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/ui/ui_dnd.c b/src/ui/ui_dnd.c
@@ -181,7 +181,7 @@ ui_dnd_feed_drag_data_received (GtkTreeDragDest *drag_dest, GtkTreePath *dest, G
 			newParent->children = NULL;
 			node->parent = newParent;
 
-			debug (DEBUG_GUI, "new newParent child list:");
+			debug (DEBUG_GUI, "new parent child list:");
 
 			/* and rebuild it from the tree model */
 			if (feedlist_get_root() != newParent)
@@ -218,13 +218,14 @@ ui_dnd_feed_drag_data_received (GtkTreeDragDest *drag_dest, GtkTreePath *dest, G
 						debug (DEBUG_GUI, "   -> %d: adding %s", pos, child->title);
 						newParent->children = g_slist_append (newParent->children, child);
 					}
+					valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (drag_dest), &iter2);
+					pos++;
 				} else {
 					debug (DEBUG_GUI, "   -> removing empty node");
 					/* remove possible existing "(empty)" node from newParent */
 					feed_list_view_remove_empty_node (&parentIter);
+					valid = FALSE;
 				}
-				valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (drag_dest), &iter2);
-				pos++;
 			}
 
 			db_node_update (node);