Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2016-07-23 22:55:41 +02:00
commit 16f293cf2c
2 changed files with 1 additions and 3 deletions

View file

@ -299,7 +299,7 @@ namespace Mist {
static bool multiWrong = false;
//Save the trackid of the track for easier access
unsigned long tid = pack.getTrackId();
if (pack.getTime() < myMeta.tracks[tid].lastms){
if (myMeta.live && pack.getTime() < myMeta.tracks[tid].lastms){
DEBUG_MSG(multiWrong?DLVL_HIGH:DLVL_WARN, "Wrong order on track %lu ignored: %lu < %lu", tid, pack.getTime(), myMeta.tracks[tid].lastms);
multiWrong = true;
return;