From 7ebbc58b9bcfef399284b6f3293590025a77946e Mon Sep 17 00:00:00 2001
From: Nikolaj Schlej <schlej@live.de>
Date: Sun, 4 Oct 2015 22:28:44 +0200
Subject: [PATCH] UT 0.21.4 / UP 0.3.8

- fixed a bug introduced in 0.21.3 commit
---
 UEFIPatch/uefipatch_main.cpp | 2 +-
 ffsengine.cpp                | 4 ++--
 uefitool.cpp                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/UEFIPatch/uefipatch_main.cpp b/UEFIPatch/uefipatch_main.cpp
index 57f7e25..419fd97 100644
--- a/UEFIPatch/uefipatch_main.cpp
+++ b/UEFIPatch/uefipatch_main.cpp
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
         result = w.patchFromFile(a.arguments().at(1));
     }
     else {
-        std::cout << "UEFIPatch 0.3.7 - UEFI image file patching utility" << std::endl << std::endl <<
+        std::cout << "UEFIPatch 0.3.8 - UEFI image file patching utility" << std::endl << std::endl <<
             "Usage: UEFIPatch image_file" << std::endl << std::endl <<
             "Patches will be read from patches.txt file\n";
         return ERR_SUCCESS;
diff --git a/ffsengine.cpp b/ffsengine.cpp
index 8a312c8..aa85da2 100644
--- a/ffsengine.cpp
+++ b/ffsengine.cpp
@@ -303,17 +303,17 @@ UINT8 FfsEngine::parseIntelImage(const QByteArray & intelImage, QModelIndex & in
                 return ERR_INVALID_FLASH_DESCRIPTOR;
             }
             biosBegin = meEnd;
+            bios = intelImage.mid(biosBegin, biosEnd);
             // biosEnd will point to the end of the image file
             // it may be wrong, but it's pretty hard to detect a padding after BIOS region
             // with malformed descriptor
         }
         // Normal descriptor map
         else {
+            bios = intelImage.mid(biosBegin, biosEnd);
             // Calculate biosEnd
             biosEnd += biosBegin;
         }
-
-        bios = intelImage.mid(biosBegin, biosEnd);
     }
     else {
         msg(tr("parseIntelImage: descriptor parsing failed, BIOS region not found in descriptor"));
diff --git a/uefitool.cpp b/uefitool.cpp
index 99e5cbf..f9d36f8 100644
--- a/uefitool.cpp
+++ b/uefitool.cpp
@@ -17,7 +17,7 @@
 UEFITool::UEFITool(QWidget *parent) :
 QMainWindow(parent),
 ui(new Ui::UEFITool),
-version(tr("0.21.3"))
+version(tr("0.21.4"))
 {
     clipboard = QApplication::clipboard();