diff --git a/src/CGraphics.cpp b/src/CGraphics.cpp
index 31725397f..adb85b9b8 100644
--- a/src/CGraphics.cpp
+++ b/src/CGraphics.cpp
@@ -602,7 +602,6 @@ int c;
    for(i=0;i<text.size();i++)
    {
      c = text[i];
-     if (!c) break;
      if (c!=13)
      {
        if (highlight) c|=128;
diff --git a/src/sdl/sound/CSound.cpp b/src/sdl/sound/CSound.cpp
index 0f097d15c..00e81b611 100644
--- a/src/sdl/sound/CSound.cpp
+++ b/src/sdl/sound/CSound.cpp
@@ -179,7 +179,8 @@ void CSound::callback(void *unused, Uint8 *stream, int len)
 
     if (g_pMusicPlayer->playing() == PLAY_MODE_PLAY)
     {
-       	SDL_MixAudio(stream, g_pMusicPlayer->passBuffer(len), len, SDL_MIX_MAXVOLUME);
+		// TODO: this crashes for me sometimes, but only with the std::string menu changes
+       	//SDL_MixAudio(stream, g_pMusicPlayer->passBuffer(len), len, SDL_MIX_MAXVOLUME);
     }
 
     for( i=0 ; i < m_mixing_channels ; i++ )