From 059234a6e0d09cafac191ee6b14d511558ca2830 Mon Sep 17 00:00:00 2001
From: Kjell Kernen <github@kernen.se>
Date: Sat, 22 Feb 2014 18:25:10 +0100
Subject: [PATCH] Fixed image load bug in burn dialog. Needs to be tested on
 Linux and Mac.

---
 companion/src/burndialog.cpp | 6 ++++--
 companion/src/helpers.cpp    | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp
index cb56b5881..764f84ab8 100644
--- a/companion/src/burndialog.cpp
+++ b/companion/src/burndialog.cpp
@@ -203,7 +203,8 @@ void burnDialog::checkFw(QString fileName)
       QString ImageStr = g.profile[g.id()].splashFile();
       bool PatchFwCB = g.profile[g.id()].patchImage();
       if (!ImageStr.isEmpty()) {
-        QImage Image = qstring2image(ImageStr);
+        QImage Image;
+        Image.load(ImageStr);
         ui->imageLabel->setPixmap(QPixmap::fromImage(Image.convertToFormat(flash.getSplashFormat())));
         ui->InvertColorButton->setEnabled(true);
         ui->PreferredImageCB->setChecked(true);
@@ -633,7 +634,8 @@ void burnDialog::on_PreferredImageCB_toggled(bool checked)
   if (checked) {
     QString ImageStr = g.profile[g.id()].splashFile();
     if (!ImageStr.isEmpty()) {
-      QImage Image = qstring2image(ImageStr);
+      QImage Image;
+      Image.load( ImageStr );
       if (ui->imageLabel->width()!=128) {
         Image=Image.convertToFormat(QImage::Format_RGB32);
         QRgb col;
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index c17bdb1b1..99dec9a63 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -694,6 +694,14 @@ QString image2qstring(QImage image)
     return ImageStr;
 }
 
+// TODO KKERNEN 20140222
+// I am sure that this code has had some kind of function, but now it only seems to cause
+// problems. I think it is an attempt to open an image file from a double byte string which
+// is first converted to a single byte string. Only used in burndialog.cpp
+// It doesn't work for me in 2.0. I do not know why. I doubt it has ever worked for files or 
+// file paths containing non-english characters.
+// Code can be removed ,when 2.0 is tested.
+
 QImage qstring2image(QString imagestr)
 {
   bool ok;