Index: sources/update/Package.cpp
===================================================================
diff -u -rd49c2482be5cf36868b964681d0e93fb3abe5b7b -r7cf31f6cfef97bb564a103c263821a3b722c8a2b
--- sources/update/Package.cpp	(.../Package.cpp)	(revision d49c2482be5cf36868b964681d0e93fb3abe5b7b)
+++ sources/update/Package.cpp	(.../Package.cpp)	(revision 7cf31f6cfef97bb564a103c263821a3b722c8a2b)
@@ -15,17 +15,20 @@
 
 #include "Package.h"
 #include "Obfuscate.h"
-#include <algorithm>
 #include "IDataProvider.h"
+#include "IEnterBootLoader.h"
 #include "UiSwUpdate.h"
 #include "UiProtocol.h"
 
-#include <qdebug.h>
-#include <thread>
-#include <errno.h>
+#include <algorithm>
 #include <chrono>
 #include <cstdio>
+#include <thread>
 
+// For Debug:
+// #include <errno.h>
+// #include <qdebug.h>
+
 /*!
  * Must be greater than a signature, and big enough to be good for streaming.
  * 
@@ -60,7 +63,8 @@
     _info(""),
     _startXml(0),
     _startData(0),
-    _pFileUpdating(nullptr) {
+    _pFileUpdating(nullptr),
+    _pIEnterBL(nullptr) {
 
     ; // NOP.
 }
@@ -200,7 +204,7 @@
     for (std::size_t ii = 0; ii < _streams.size(); ii++) {
         sv.push_back(&_streams[ii]);
     }
-    return SwUpdate::UiSwUpdate::instance().start(sv);
+    return SwUpdate::UiSwUpdate::instance().start(sv, _pIEnterBL);
 }
 
 /*!
@@ -261,7 +265,7 @@
         sv.push_back(&_streams[ii]);
     }
     
-    return SwUpdate::UiSwUpdate::instance().start(sv);
+    return SwUpdate::UiSwUpdate::instance().start(sv, _pIEnterBL);
 }
 
 /*!
@@ -840,29 +844,26 @@
                     {
                         if (std::find(_avoid.begin(), _avoid.end(), fileNamePath) == _avoid.end()) {
                             _avoid.push_back(fileNamePath);
-                            qDebug() << "Not added " << QString::fromStdString(fileNamePath) << "\n";
+                            // qDebug() << "Not added " << QString::fromStdString(fileNamePath) << "\n";
                         }
                     }
                 }
                 else 
                 {
-                    // Keep seeing errno = 0x18 = 24 which is EMFILE  = ran out of file handles for the app.
-                    // Which indicates an fclose didn't happen, which makes no sense.
-                    int err = errno;
-                    qDebug() << "Not opened " << QString::fromStdString(fileNamePath) << " errno = " << err << "\n";
+                    // int err = errno;
+                    // qDebug() << "Not opened " << QString::fromStdString(fileNamePath) << " errno = " << err << "\n";
                 }
             } catch (...) {
-                qDebug() << "Throw 1\n";
+                // qDebug() << "Throw 1\n";
                 ; // Allow the user to keep iterating across the rest of this directory.
             }
             
             // Close it.
             if (fp != NULL) {
                 int fclose_rv = fclose(fp);
                 if (fclose_rv != 0) {
-                    int err = errno;
-
-                    qDebug() << "Not closed " << QString::fromStdString(fileNamePath) << " errno = " << err << " fcloserv = " << fclose_rv << "\n";
+                    // int err = errno;
+                    // qDebug() << "Not closed " << QString::fromStdString(fileNamePath) << " errno = " << err << " fcloserv = " << fclose_rv << "\n";
                 }
             }
         }