Oops. Fix 'buffered dive' information

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index 5367571ad6e6520c5b2fc6db21ee2c3907916f90..360af8498a45a12d8dda70bb56f15257f2b1b82d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -100,10 +100,10 @@ void update_dive(struct dive *new_dive)
                flush_dive_equipment_changes(old_dive);
        }
        if (new_dive) {
-               buffered_dive = new_dive;
                show_dive_info(new_dive);
                show_dive_equipment(new_dive);
        }
+       buffered_dive = new_dive;
 }
 
 void repaint_dive(void)
@@ -312,6 +312,8 @@ static void unit_dialog(GtkWidget *w, gpointer data)
        gtk_widget_show_all(dialog);
        result = gtk_dialog_run(GTK_DIALOG(dialog));
        if (result == GTK_RESPONSE_ACCEPT) {
+               /* Make sure to flush any modified old dive data with old units */
+               update_dive(NULL);
                output_units = menu_units;
                update_dive_list_units(&dive_list);
                repaint_dive();