1 files changed, 10 insertions, 2 deletions

diff --git a/src/csvreader.cpp b/src/csvreader.cpp
index 1f623fa..b045773 100644
--- a/src/csvreader.cpp
+++ b/src/csvreader.cpp
@@ -43,14 +43,22 @@ Bu::StrArray Bu::CsvReader::readLine()
 
         Bu::FString sLine = sIn.readLine();
 
-        for( Bu::FString::iterator i = sLine.begin(); i; i++ )
+        Bu::FString::iterator i = sLine.begin();
+
+        aVals.append( sDecode( i ) );
+
+        while( i )
         {
                 if( *i == ',' )
                 {
+                        i++;
+                        aVals.append( sDecode( i ) );
                 }
                 else
                 {
-                        aVals.append( sDecode( i ) );
+                        // Blanks and stuff?
+                        sio << "Out of bound:  '" << *i << "'" << sio.nl;
+                        i++;
                 }
         }