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

Don't crash when music not found

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6573 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-11-15 18:41:11 +00:00
parent 596b726362
commit f0227bfd19
3 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/states_screens/grand_prix_lose.cpp
View File

@ -56,7 +56,15 @@ GrandPrixLose::GrandPrixLose() : Screen("grand_prix_lose.stkgui")
m_throttle_FPS = false;
m_music = music_manager->getMusicInformation(file_manager->getMusicFile("lose_theme.music"));
try
{
m_music = music_manager->getMusicInformation(file_manager->getMusicFile("lose_theme.music"));
}
catch (std::exception& e)
{
fprintf(stderr, "%s", e.what());
m_music = NULL;
}
} // GrandPrixLose
// -------------------------------------------------------------------------------------
@ -74,7 +82,6 @@ void GrandPrixLose::loadedFromFile()
void GrandPrixLose::init()
{
Screen::init();
//music_manager->startMusic(music_manager->getMusicInformation(file_manager->getMusicFile("lose_theme.music")));
m_phase = 1;
m_sky_angle = 0.0f;

12
src/states_screens/grand_prix_win.cpp
View File

@ -37,7 +37,15 @@ GrandPrixWin::GrandPrixWin() : Screen("grand_prix_win.stkgui")
m_throttle_FPS = false;
m_music = music_manager->getMusicInformation(file_manager->getMusicFile("win_theme.music"));
try
{
m_music = music_manager->getMusicInformation(file_manager->getMusicFile("win_theme.music"));
}
catch (std::exception& e)
{
fprintf(stderr, "%s", e.what());
m_music = NULL;
}
} // GrandPrixWin
// -------------------------------------------------------------------------------------
@ -130,8 +138,6 @@ void GrandPrixWin::init()
unlocked_label->add();
}
//music_manager->startMusic(music_manager->getMusicInformation(file_manager->getMusicFile("win_theme.music")));
m_phase = 1;
m_sky_angle = 0.0f;

28
src/tracks/track.cpp
View File

@ -263,18 +263,26 @@ void Track::getMusicInformation(std::vector<std::string>& filenames,
}
if(!mi)
{
std::string shared_name = file_manager->getMusicFile(filenames[i]);
if(shared_name!="")
try
{
try
std::string shared_name = file_manager->getMusicFile(filenames[i]);
if(shared_name!="")
{
mi = music_manager->getMusicInformation(shared_name);
}
catch(std::runtime_error)
{
mi = NULL;
}
} // shared_name!=""
try
{
mi = music_manager->getMusicInformation(shared_name);
}
catch(std::runtime_error)
{
mi = NULL;
}
} // shared_name!=""
}
catch (std::exception& e)
{
mi = NULL;
}
}
if(!mi)
{