t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix when no file is selected

Browse Source
This commit is contained in:
canpadawan
2016-05-31 14:48:45 +02:00
parent 8524824876
commit 77031f1310
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbchandler.cpp
+4 -1
View File
@@ -764,8 +764,11 @@ DBCFile* DBCHandler::loadDBCFile(int idx)
DBCFile newFile; DBCFile newFile;
newFile.loadFile(filename); newFile.loadFile(filename);
loadedFiles.append(newFile); loadedFiles.append(newFile);
return &loadedFiles.last();
} }
return &loadedFiles.last();
return NULL;
} }
void DBCHandler::removeDBCFile(int idx) void DBCHandler::removeDBCFile(int idx)
dbcloadsavewindow.cpp
+6 -4
View File
@@ -48,10 +48,12 @@ void DBCLoadSaveWindow::newFile()
void DBCLoadSaveWindow::loadFile() void DBCLoadSaveWindow::loadFile()
{ {
DBCFile *file = dbcHandler->loadDBCFile(-1); DBCFile *file = dbcHandler->loadDBCFile(-1);
int idx = ui->tableFiles->rowCount(); if(file) {
ui->tableFiles->insertRow(ui->tableFiles->rowCount()); int idx = ui->tableFiles->rowCount();
ui->tableFiles->setItem(idx, 0, new QTableWidgetItem(file->getFullFilename())); ui->tableFiles->insertRow(ui->tableFiles->rowCount());
ui->tableFiles->setItem(idx, 1, new QTableWidgetItem("-1")); ui->tableFiles->setItem(idx, 0, new QTableWidgetItem(file->getFullFilename()));
ui->tableFiles->setItem(idx, 1, new QTableWidgetItem("-1"));
}
} }
void DBCLoadSaveWindow::saveFile() void DBCLoadSaveWindow::saveFile()