[alsa-devel] [PATCH] hdajackretask: Fix "advanced override" bug
The values were not correctly retreived from the comboboxes.
Signed-off-by: David Henningsson david.henningsson@canonical.com --- hdajackretask/main-gtk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hdajackretask/main-gtk.c b/hdajackretask/main-gtk.c index 65d0f3a..4227669 100644 --- a/hdajackretask/main-gtk.c +++ b/hdajackretask/main-gtk.c @@ -183,14 +183,14 @@ static void update_user_pin_config(ui_data_t* ui) continue;
if (ui->free_overrides) { - int i; + int j; int index; unsigned long val = 0; - for (i = 0; i < FREE_OVERRIDES_COUNT; i++) { - index = gtk_combo_box_get_active(GTK_COMBO_BOX(pin_ui->jacktype)); - if (index < 0) + for (j = 0; j < FREE_OVERRIDES_COUNT; j++) { + index = gtk_combo_box_get_active(GTK_COMBO_BOX(pin_ui->free_override_cb[j])); + if (index < 0) break; - val += get_free_override_list(i)[index].value; + val += get_free_override_list(j)[index].value; } if (index < 0) continue;
At Thu, 28 Feb 2013 22:01:08 +0100, David Henningsson wrote:
The values were not correctly retreived from the comboboxes.
Signed-off-by: David Henningsson david.henningsson@canonical.com
Thanks, applied.
Takashi
hdajackretask/main-gtk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hdajackretask/main-gtk.c b/hdajackretask/main-gtk.c index 65d0f3a..4227669 100644 --- a/hdajackretask/main-gtk.c +++ b/hdajackretask/main-gtk.c @@ -183,14 +183,14 @@ static void update_user_pin_config(ui_data_t* ui) continue;
if (ui->free_overrides) {
int i;
int j; int index; unsigned long val = 0;
for (i = 0; i < FREE_OVERRIDES_COUNT; i++) {
index = gtk_combo_box_get_active(GTK_COMBO_BOX(pin_ui->jacktype));
if (index < 0)
for (j = 0; j < FREE_OVERRIDES_COUNT; j++) {
index = gtk_combo_box_get_active(GTK_COMBO_BOX(pin_ui->free_override_cb[j]));
if (index < 0) break;
val += get_free_override_list(i)[index].value;
val += get_free_override_list(j)[index].value; } if (index < 0) continue;
-- 1.7.9.5
participants (2)
-
David Henningsson
-
Takashi Iwai