]> git.tdb.fi Git - ext/subsurface.git/commitdiff
Merge branch 'forlinus' of git://github.com/dirkhh/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Nov 2011 17:41:05 +0000 (15:41 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Nov 2011 17:41:05 +0000 (15:41 -0200)
* 'forlinus' of git://github.com/dirkhh/subsurface:
  Make sure SAC and OTU get recalculated after cylinder info was changed

info.c

diff --git a/info.c b/info.c
index 75b34bb782c85da7fbee0bd8a35e2296b857b75f..11107b1ca91c461eb41245bea72032238305f8fe 100644 (file)
--- a/info.c
+++ b/info.c
@@ -98,9 +98,9 @@ void flush_dive_info_changes(struct dive *dive)
 static void set_combo_box_entry_text(GtkComboBoxEntry *combo_box, const char *text)
 {
        GtkEntry *entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
-       gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
+       gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), -1);
        if (!*text)
-               text = " ";
+               gtk_entry_set_text(entry, " ");
        gtk_entry_set_text(entry, text);
 }