From d8f7bde3243a4d54a422aa3209492a364aac38e0 Mon Sep 17 00:00:00 2001
From: Kjell Kernen <github@kernen.se>
Date: Sun, 23 Feb 2014 16:10:19 +0100
Subject: [PATCH] Fixed assert error

---
 companion/src/appdata.h      | 2 +-
 companion/src/burndialog.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/companion/src/appdata.h b/companion/src/appdata.h
index 7377bb4f0..fd037dd3b 100644
--- a/companion/src/appdata.h
+++ b/companion/src/appdata.h
@@ -287,7 +287,7 @@ class AppData: protected CompStoreObj
     int iconSize();
     int historySize();
     int jsCtrl();
-    int modelEditTab();
+    int modelEditTab();  // This variable is unused an can be removed
     int id();
     int theme();
     int warningId();
diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp
index bb1a32bf0..81c0ef3df 100644
--- a/companion/src/burndialog.cpp
+++ b/companion/src/burndialog.cpp
@@ -141,6 +141,8 @@ void burnDialog::on_FlashLoadButton_clicked()
   QTimer::singleShot(0, this, SLOT(shrink()));
   if (hexType==FLASH_FILE_TYPE) {
     fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER);
+    if(fileName.isEmpty())
+      return;
     checkFw(fileName);
   }
   else {