# HG changeset patch
# User Giacomo Lozito <james@develia.org>
# Date 1187397906 -7200
# Node ID e7d8727fb90137ca4350be8f007ccde10fee799d
# Parent  8430c3911856c7a5ddef292387cc02092231010e
fixed a tuple parser bug, expression depth level wasn't correctly updated in certain nested situations

diff -r 8430c3911856 -r e7d8727fb901 src/audacious/tuple_formatter.c
--- a/src/audacious/tuple_formatter.c	Sat Aug 18 00:31:51 2007 +0200
+++ b/src/audacious/tuple_formatter.c	Sat Aug 18 02:45:06 2007 +0200
@@ -124,16 +124,19 @@
                         level++;
                     }
                 }
-                else if (*iter == '}' && (sel == argument))
+                else if (*iter == '}')
                 {
                     level--;
-                    if (level == 0)
-                      break;
+                    if (sel == argument)
+                    {
+                        if (level == 0)
+                            break;
+                        else
+                            g_string_append_c(sel, *iter);
+                    }
                     else
-                      g_string_append_c(sel, *iter);
+                        break;
                 }
-                else if (*iter == '}' && ((sel != argument)))
-                    break;
                 else
                     g_string_append_c(sel, *iter);
             }
@@ -188,16 +191,19 @@
                         level++;
                     }
                 }
-                else if (*iter == '}' && (sel == argument))
+                else if (*iter == '}')
                 {
                     level--;
-                    if (level == 0)
-                      break;
+                    if (sel == argument)
+                    {
+                        if (level == 0)
+                            break;
+                        else
+                            g_string_append_c(sel, *iter);
+                    }
                     else
-                    g_string_append_c(sel, *iter);
+                        break;
                 }
-                else if (*iter == '}' && ((sel != argument)))
-                    break;
                 else
                     g_string_append_c(sel, *iter);
             }