ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash/abort in STK when the .readme file for a song wasn't found.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1515 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-02-18 10:13:25 +00:00
parent 2d0f761ffe
commit d6ca127ae4
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/sound_manager.cpp
View File

@ -190,9 +190,21 @@ void SoundManager::playMusic(const std::string& filename)
return;
}
m_current_music->playMusic();
// Read up to two lines from the corresponding .readme file: first one
// the title, second the composer. This is then displayed by the race gui
std::string name_readme = loader->getPath(StringUtils::without_extension(filename)+".readme");
std::string name_readme;
try
{
name_readme = loader->getPath(
StringUtils::without_extension(filename)+".readme");
}
catch(std::exception)
{
// Silently ignore any missing .readme files, m_description was cleared above
return;
}
std::ifstream f(name_readme.c_str());
if(f)
{
@ -201,7 +213,6 @@ void SoundManager::playMusic(const std::string& filename)
std::getline(f,s); if(!f.eof()) m_description.push_back(s);
f.close();
}
m_current_music->playMusic();
} // playMusic
//-----------------------------------------------------------------------------