1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-07-01 16:37:46 +02:00

Merge branch 'RomeroMalaquias-master'

This commit is contained in:
Jfreegman 2015-12-09 01:32:07 -05:00
commit 36feebfe8d

View File

@ -234,17 +234,17 @@ void* do_playing(void* _p)
} }
bool has_looping = false; bool has_looping = false;
bool test_active_notify = false;
int i; int i;
for (i = 0; i < ACTIVE_NOTIFS_MAX; i ++) { for (i = 0; i < ACTIVE_NOTIFS_MAX; i ++) {
if (actives[i].looping) has_looping = true; if (actives[i].looping) has_looping = true;
test_active_notify = actives[i].active && !actives[i].looping;
if (actives[i].active && !actives[i].looping #ifdef BOX_NOTIFY
#ifdef BOX_NOTIFY test_active_notify = test_active_notify && !actives[i].box;
&& !actives[i].box #endif
#endif if (test_active_notify) {
) {
if(actives[i].id_indicator) if(actives[i].id_indicator)
*actives[i].id_indicator = -1; /* reset indicator value */ *actives[i].id_indicator = -1; /* reset indicator value */