- Timestamp:
- Feb 4, 2011, 10:53:23 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/bncwindow.cpp
r2964 r2965 1184 1184 QString hlp; 1185 1185 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 } 1189 1193 } 1190 1194 … … 1261 1265 settings.setValue("statusTab", _loggroup->currentIndex()); 1262 1266 settings.setValue("waitTime", _waitTimeSpinBox->value()); 1263 settings.setValue("combineStreams", combineStreams); 1267 if (!combineStreams.isEmpty()) { 1268 settings.setValue("combineStreams", combineStreams); 1269 } 1264 1270 settings.setValue("cmbOutHost", _cmbOutHostLineEdit->text()); 1265 1271 settings.setValue("cmbOutPort", _cmbOutPortLineEdit->text()); … … 1972 1978 while (it.hasNext()) { 1973 1979 QStringList hlp = it.next().split(" "); 1974 if (hlp.size() > 0) {1980 if (hlp.size() > 2) { 1975 1981 ++iRow; 1976 1982 _cmbTable->insertRow(iRow);
Note:
See TracChangeset
for help on using the changeset viewer.