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

Merge pull request #205 from Jun-pei/patch-1

Browse Source 
Fixed Sal's oopsie
This commit is contained in:
Rosemary Witchaven 2021-09-18 03:52:10 -05:00 committed by GitHub
commit 3a46d844fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/area_data.cpp
View File

@ -541,9 +541,9 @@ QString AreaData::addJukeboxSong(QString f_song)
if (m_jukebox_queue.size() == 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);
setMusicPlayedBy("Jukebox");
} }
setCurrentMusic(f_song);
setMusicPlayedBy("Jukebox");
m_jukebox_queue.append(f_song); m_jukebox_queue.append(f_song);
return "Song added to Jukebox."; return "Song added to Jukebox.";
} }