michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-12-28 08:37:22 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Close generalDialog when in USBMS

Browse source
This commit is contained in:
Nicolas Mailloux 2021-06-29 14:42:51 -04:00
parent 482d90f910
commit b7e772cbe1
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
generaldialog.cpp
View file

@ -134,6 +134,10 @@ void generalDialog::on_cancelBtn_clicked()
string_writeconfig("/tmp/cancelUpdateDialog", "true"); string_writeconfig("/tmp/cancelUpdateDialog", "true");
generalDialog::close(); generalDialog::close();
} }
else if(usbmsDialog == true) {
global::usbms::usbmsDialog = false;
generalDialog::close();
}
else { else {
generalDialog::close(); generalDialog::close();
} }

3
mainwindow.cpp
View file

@ -505,6 +505,9 @@ MainWindow::MainWindow(QWidget *parent)
QProcess *proc = new QProcess(); QProcess *proc = new QProcess();
proc->start(prog, args); proc->start(prog, args);
QFile::remove("/mnt/onboard/onboard/.inkbox/DEVKEY");
QFile::remove("/mnt/onboard/onboard/.inkbox/DEVKEY.dgst");
reboot(true); reboot(true);
} }
} }

1
settings.cpp
View file

@ -738,6 +738,7 @@ void settings::on_enableUiScalingCheckBox_toggled(bool checked)
void settings::on_showSystemInfoBtn_clicked() void settings::on_showSystemInfoBtn_clicked()
{ {
getSystemInfo(); getSystemInfo();
global::usbms::usbmsDialog = false;
global::text::textBrowserContents = global::systemInfoText; global::text::textBrowserContents = global::systemInfoText;
global::text::textBrowserDialog = true; global::text::textBrowserDialog = true;