From 77031f131089dd82bf453bc69d92e554b72874d7 Mon Sep 17 00:00:00 2001
From: canpadawan <canpadawan@users.noreply.github.com>
Date: Tue, 31 May 2016 14:48:45 +0200
Subject: [PATCH] bug fix when no file is selected

---
 dbchandler.cpp        |  5 ++++-
 dbcloadsavewindow.cpp | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dbchandler.cpp b/dbchandler.cpp
index 2851c60..057ecb1 100644
--- a/dbchandler.cpp
+++ b/dbchandler.cpp
@@ -764,8 +764,11 @@ DBCFile* DBCHandler::loadDBCFile(int idx)
         DBCFile newFile;
         newFile.loadFile(filename);
         loadedFiles.append(newFile);
+
+        return &loadedFiles.last();
     }
-    return &loadedFiles.last();
+
+    return NULL;
 }
 
 void DBCHandler::removeDBCFile(int idx)
diff --git a/dbcloadsavewindow.cpp b/dbcloadsavewindow.cpp
index e66a9b5..0ef704d 100644
--- a/dbcloadsavewindow.cpp
+++ b/dbcloadsavewindow.cpp
@@ -48,10 +48,12 @@ void DBCLoadSaveWindow::newFile()
 void DBCLoadSaveWindow::loadFile()
 {
     DBCFile *file = dbcHandler->loadDBCFile(-1);
-    int idx = ui->tableFiles->rowCount();
-    ui->tableFiles->insertRow(ui->tableFiles->rowCount());
-    ui->tableFiles->setItem(idx, 0, new QTableWidgetItem(file->getFullFilename()));
-    ui->tableFiles->setItem(idx, 1, new QTableWidgetItem("-1"));
+    if(file) {
+        int idx = ui->tableFiles->rowCount();
+        ui->tableFiles->insertRow(ui->tableFiles->rowCount());
+        ui->tableFiles->setItem(idx, 0, new QTableWidgetItem(file->getFullFilename()));
+        ui->tableFiles->setItem(idx, 1, new QTableWidgetItem("-1"));
+    }
 }
 
 void DBCLoadSaveWindow::saveFile()