From 70f903c457a3b82cdaa62e232124cdbba5c11bc5 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 17 Aug 2012 07:39:50 -0700 Subject: [PATCH] multi-dive editing: don't change fields that weren't changed for the master dive Commit 2f773b97e042 ("multi-dive editing: don't change already set data for other dives") didn't get the multi-dive editing quite right: even if one of the dives in the list of changed dives has an empty field, we should *not* fill it with the edit data unless that edit data was actually changed. So compare the new data with the original master data, and if they match, do nothing. Signed-off-by: Linus Torvalds --- info.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/info.c b/info.c index 846d51e..5a620e7 100644 --- a/info.c +++ b/info.c @@ -83,6 +83,9 @@ static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp, new = gtk_entry_get_text(entry); while (isspace(*new)) new++; + /* If the master string didn't change, don't change other dives either! */ + if (!text_changed(master,new)) + return NULL; if (!text_changed(old,new)) return NULL; free(old); -- 2.45.2