Merge "Merge remote-tracking branch 'origin/stable' into dev" into dev

1 files changed, 11 insertions, 6 deletions

diff --git a/src/b2qt-flashing-wizard/platform_page.cpp b/src/b2qt-flashing-wizard/platform_page.cpp
index 49cb5bd..6437933 100644
--- a/src/b2qt-flashing-wizard/platform_page.cpp
+++ b/src/b2qt-flashing-wizard/platform_page.cpp
@@ -66,6 +66,8 @@ PlatformPage::~PlatformPage()
 
 bool PlatformPage::isComplete() const
 {
+    if (mButtons.isEmpty() || buttonData().name.isEmpty())
+          return false;
     return true;
 }
 
@@ -125,16 +127,19 @@ void PlatformPage::initializePage()
 
     QDir dir(G_SDKDIR);
     foreach (const QString i, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
-        if (!i.startsWith("Boot2Qt-"))
-          continue;
-
         QDir dir2(dir.absoluteFilePath(i));
+
+        if (i.startsWith("Boot2Qt-")) {
+            // nothing
+        } else if (dir2.exists("Boot2Qt")) {
+            dir2 = dir2.absoluteFilePath("Boot2Qt");
+        } else {
+            continue;
+        }
+
         foreach (const QString j, dir2.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
             if (j.startsWith("emulator-"))
                 continue;
-            QStringList token = j.split('-');
-            QString os = token.takeLast();
-            QString name = token.join("-");
 
             loadDeployConfig(dir2.absoluteFilePath(j) + "/images/deploy.conf", i);
         }