Merge branch 'upstream/next'

2014-04-16 09:34:14 +02:00
parent cd9facb147 f6d1b0c46f
commit 4ccbc13f6a
44 changed files with 2840 additions and 3020 deletions
@@ -605,7 +605,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
      if (item == source) b->setCurrentIndex(b->count()-1);
    }

-    for (int i=0; i<GetEepromInterface()->getCapability(Outputs)+GetEepromInterface()->getCapability(ExtraChannels); i++) {
+    for (int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
      item = RawSource(SOURCE_TYPE_CH, i);
      b->addItem(item.toString(), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);