← Back to branch summary

~mhaulo/mixxx/allow-playlist-and-crate-renaming

« back to all changes in this revision

Viewing changes to mixxx/src/dlgprefsound.cpp

  • Committer: Bill Good
  • Date: 2010-12-17 21:53:36 UTC
  • mfrom: (2607.1.24 1.9)
  • Revision ID: bkgood@gmail.com-20101217215336-lbni33ug8af0h7rt
Merged fixes from lp:mixxx/1.9

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/dlgprefsound.cpp
246
246
    int sampleRateIndex = sampleRateComboBox->findData(m_config.getSampleRate());
247
247
    if (sampleRateIndex != -1) {
248
248
        sampleRateComboBox->setCurrentIndex(sampleRateIndex);
 
249
        if (latencyComboBox->count() <= 0) {
 
250
            updateLatencies(sampleRateIndex); // so the latency combo box is
 
251
            // sure to be populated, if setCurrentIndex is called with the 
 
252
            // currentIndex, the currentIndexChanged signal won't fire and
 
253
            // the updateLatencies slot won't run -- bkgood lp bug 689373
 
254
        }
249
255
    }
250
256
    int latencyIndex = latencyComboBox->findData(m_config.getLatency());
251
257
    if (latencyIndex != -1) {