mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
multi-dive editing: don't change fields that weren't changed for the master dive
Commit 2f773b97e0
("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 <torvalds@linux-foundation.org>
This commit is contained in:
parent
9451617760
commit
70f903c457
1 changed files with 3 additions and 0 deletions
3
info.c
3
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);
|
||||
|
|
Loading…
Add table
Reference in a new issue