Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2015-07-22 10:28:10 +02:00
commit 279dc470da

View file

@ -427,7 +427,9 @@ namespace Mist {
if (!tid) {
return;
}
userClient.keepAlive();
if (userClient.getData()){
userClient.keepAlive();
}
if (trackMap.count(tid) && !trackState.count(tid)) {
//If the trackmap has been set manually, don't negotiate
HIGH_MSG("TrackMap manual, not negotiating track IDs");