From b7e772cbe1c7e24520b6d06da2f9718ded8d376f Mon Sep 17 00:00:00 2001
From: Nicolas Mailloux <nicolecrivain@gmail.com>
Date: Tue, 29 Jun 2021 14:42:51 -0400
Subject: [PATCH] Close generalDialog when in USBMS

---
 generaldialog.cpp | 4 ++++
 mainwindow.cpp    | 3 +++
 settings.cpp      | 1 +
 3 files changed, 8 insertions(+)

diff --git a/generaldialog.cpp b/generaldialog.cpp
index 49c3e06..7480688 100644
--- a/generaldialog.cpp
+++ b/generaldialog.cpp
@@ -134,6 +134,10 @@ void generalDialog::on_cancelBtn_clicked()
         string_writeconfig("/tmp/cancelUpdateDialog", "true");
         generalDialog::close();
     }
+    else if(usbmsDialog == true) {
+        global::usbms::usbmsDialog = false;
+        generalDialog::close();
+    }
     else {
         generalDialog::close();
     }
diff --git a/mainwindow.cpp b/mainwindow.cpp
index f0073c0..70affd8 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -505,6 +505,9 @@ MainWindow::MainWindow(QWidget *parent)
         QProcess *proc = new QProcess();
         proc->start(prog, args);
 
+        QFile::remove("/mnt/onboard/onboard/.inkbox/DEVKEY");
+        QFile::remove("/mnt/onboard/onboard/.inkbox/DEVKEY.dgst");
+
         reboot(true);
     }
 }
diff --git a/settings.cpp b/settings.cpp
index d7dd7ba..736c29a 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -738,6 +738,7 @@ void settings::on_enableUiScalingCheckBox_toggled(bool checked)
 void settings::on_showSystemInfoBtn_clicked()
 {
     getSystemInfo();
+    global::usbms::usbmsDialog = false;
     global::text::textBrowserContents = global::systemInfoText;
     global::text::textBrowserDialog = true;