Err...well, that merge failed. Try this one.

src/BitmapText.cpp

@@ -328,6 +328,9 @@ void BitmapText::DrawChars( bool bUseStrokeTexture )
 		}
 	}
 
+	vector<RageSpriteVertex*> vertices;
+	int iNumVertsToDraw = 0;
+
 	for( int start = iStartGlyph; start < iEndGlyph; )
 	{
 		int end = start;
@@ -350,12 +353,14 @@ void BitmapText::DrawChars( bool bUseStrokeTexture )
 			Actor::SetTextureRenderStates();
 			
 			RageSpriteVertex &start_vertex = m_aVertices[start*4];
-			int iNumVertsToDraw = (end-start)*4;
-			DISPLAY->DrawQuads( &start_vertex, iNumVertsToDraw );
+			vertices.push_back(&start_vertex);
+			iNumVertsToDraw += (end-start)*4;
 		}
 
 		start = end;
 	}
+	if (!vertices.empty())
+		DISPLAY->DrawQuads( vertices[0], iNumVertsToDraw );
 }
 
 /* sText is UTF-8. If not all of the characters in sText are available in the