# HG changeset patch
# User Chris Cannam
# Date 1417110681 0
# Node ID 9c00e7944bf271b39432a229a6304df3bca5f696
# Parent  a73c44ae5acb0c2d06244b04952327abe3439399# Parent  4a2c150ecd679a637a0fdcdb262b232efa137ecd
Merge

diff -r 4a2c150ecd67 -r 9c00e7944bf2 base/StringBits.cpp
--- a/base/StringBits.cpp	Thu Nov 20 16:18:31 2014 +0000
+++ b/base/StringBits.cpp	Thu Nov 27 17:51:21 2014 +0000
@@ -83,14 +83,14 @@
 	    switch (mode) {
 	    case sep: mode = q1; break;
 	    case unq: case q2: tok += c; break;
-	    case q1: mode = sep; tokens << tok; tok = ""; break;
+	    case q1: mode = unq; break;
 	    }
 
 	} else if (c == '"') {
 	    switch (mode) {
 	    case sep: mode = q2; break;
 	    case unq: case q1: tok += c; break;
-	    case q2: mode = sep; tokens << tok; tok = ""; break;
+	    case q2: mode = unq; break;
 	    }
 
 	} else if (c == separator || (separator == ' ' && c.isSpace())) {