Merge branch 'issue-41-fix'

This commit is contained in:
Kasper Moskwiak 2016-04-05 19:20:17 +02:00
commit 6aaf286f59

View file

@ -269,7 +269,7 @@
if (selectedRes === 'high') { if (selectedRes === 'high') {
selectedRes = src[0].res; selectedRes = src[0].res;
selectedLabel = src[0].label; selectedLabel = src[0].label;
} else if (selectedRes === 'low' || selectedRes == null) { } else if (selectedRes === 'low' || selectedRes == null || !groupedSrc.res[selectedRes]) {
// Select low-res if default is low or not set // Select low-res if default is low or not set
selectedRes = src[src.length - 1].res; selectedRes = src[src.length - 1].res;
selectedLabel = src[src.length -1].label; selectedLabel = src[src.length -1].label;
@ -277,9 +277,6 @@
selectedLabel = groupedSrc.res[selectedRes][0].label; selectedLabel = groupedSrc.res[selectedRes][0].label;
} }
if(selectedRes === undefined){
return {res: selectedRes, label: selectedLabel, sources: groupedSrc.label[selectedLabel]};
}
return {res: selectedRes, label: selectedLabel, sources: groupedSrc.res[selectedRes]}; return {res: selectedRes, label: selectedLabel, sources: groupedSrc.res[selectedRes]};
} }