i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CDPlayer doesn't crash anymore when the CDDB lookup fails

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13551 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2005-07-08 01:37:37 +00:00
parent 79482d6383
commit 66c912db47
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/cdplayer/CDPlayer.cpp
+17 -8
View File
@@ -528,20 +528,29 @@ CDPlayer::UpdateCDInfo(void)
vector<BString> trackNames;
int32 currentTrack = engine->TrackStateWatcher()->GetTrack();
engine->ContentWatcher()->GetContent(&CDName,&trackNames);
if(currentTrack < 1)
return;
fCDTitle->SetText(CDName.String());
bool trackresult =engine->ContentWatcher()->GetContent(&CDName,&trackNames);
if(trackresult)
fCDTitle->SetText(CDName.String());
else
fCDTitle->SetText("Audio CD");
if(currentTrack > 0)
{
currentTrackName << "Track " << currentTrack << ": " << trackNames[ currentTrack - 1];
if(trackresult)
{
currentTrackName << "Track " << currentTrack << ": " << trackNames[ currentTrack - 1];
fCurrentTrack->SetText(currentTrackName.String());
return;
}
currentTrackName << "Track " << currentTrack;
fCurrentTrack->SetText(currentTrackName.String());
}
else
{
fCurrentTrack->SetText("Track:");
}
}
void