Changeset 2965 in ntrip for trunk/BNC


Ignore:
Timestamp:
Feb 4, 2011, 10:53:23 AM (14 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/bncwindow.cpp

    r2964 r2965  
    11841184    QString hlp;
    11851185    for (int iCol = 0; iCol < _cmbTable->columnCount(); iCol++) {
    1186       hlp += _cmbTable->item(iRow, iCol)->text() + " ";
    1187     }
    1188     combineStreams << hlp;
     1186      if (_cmbTable->item(iRow, iCol)) {
     1187        hlp += _cmbTable->item(iRow, iCol)->text() + " ";
     1188      }
     1189    }
     1190    if (!hlp.isEmpty()) {
     1191      combineStreams << hlp;
     1192    }
    11891193  }
    11901194
     
    12611265  settings.setValue("statusTab",   _loggroup->currentIndex());
    12621266  settings.setValue("waitTime",    _waitTimeSpinBox->value());
    1263   settings.setValue("combineStreams", combineStreams);
     1267  if (!combineStreams.isEmpty()) {
     1268    settings.setValue("combineStreams", combineStreams);
     1269  }
    12641270  settings.setValue("cmbOutHost",    _cmbOutHostLineEdit->text());
    12651271  settings.setValue("cmbOutPort",    _cmbOutPortLineEdit->text());
     
    19721978  while (it.hasNext()) {
    19731979    QStringList hlp = it.next().split(" ");
    1974     if (hlp.size() > 0) {
     1980    if (hlp.size() > 2) {
    19751981      ++iRow;
    19761982      _cmbTable->insertRow(iRow);
Note: See TracChangeset for help on using the changeset viewer.