Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #203 from Salanto/fix-jukeboxadding

Browse Source 
Fix Jukebox incorrectly discarding songs
This commit is contained in:
Rosemary Witchaven 2021-09-13 17:10:00 -05:00 committed by GitHub
commit 45036a9b6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/area_data.cpp
View File

@ -536,22 +536,22 @@ void AreaData::toggleJukebox()
QString AreaData::addJukeboxSong(QString f_song) QString AreaData::addJukeboxSong(QString f_song)
{ {
if(!m_jukebox_queue.contains(f_song)) { if(!m_jukebox_queue.contains(f_song)) {
if (m_jukebox_queue.size() == 0) {
int l_song_duration = ConfigManager::songInformation(f_song); int l_song_duration = ConfigManager::songInformation(f_song);
if (l_song_duration >= 0) { if (l_song_duration > 0) {
if (m_jukebox_queue.size() == 0) {
emit playJukeboxSong(AOPacket("MC",{f_song,QString::number(-1)}), index()); emit playJukeboxSong(AOPacket("MC",{f_song,QString::number(-1)}), index());
m_jukebox_timer->start(l_song_duration * 1000); m_jukebox_timer->start(l_song_duration * 1000);
}
setCurrentMusic(f_song); setCurrentMusic(f_song);
setMusicPlayedBy("Jukebox"); setMusicPlayedBy("Jukebox");
m_jukebox_queue.append(f_song); m_jukebox_queue.append(f_song);
return "Song added to Jukebox."; return "Song added to Jukebox.";
} }
}
return "Unable to add song. Duration shorther than 1.";
}
else { else {
return "Unable to add song. Song already in Jukebox."; return "Unable to add song. Duration shorter than 1.";
} }
}
return "Unable to add song. Song already in Jukebox.";
} }
void AreaData::switchJukeboxSong() void AreaData::switchJukeboxSong()