ui

panda/board/obj/gitversion.h

@@ -1,2 +1,2 @@
 extern const uint8_t gitversion[19];
-const uint8_t gitversion[19] = "DEV-c082d60d-DEBUG";
+const uint8_t gitversion[19] = "DEV-2712642d-DEBUG";

panda/board/obj/version

@@ -1 +1 @@
-DEV-c082d60d-DEBUG
+DEV-2712642d-DEBUG

selfdrive/ui/qt/window.cc

@@ -13,6 +13,17 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {
   QObject::connect(homeWindow, &HomeWindow::openSettings, this, &MainWindow::openSettings);
   QObject::connect(homeWindow, &HomeWindow::closeSettings, this, &MainWindow::closeSettings);
 
+  settingsWindow = new SettingsWindow(this);
+  main_layout->addWidget(settingsWindow);
+  QObject::connect(settingsWindow, &SettingsWindow::closeSettings, this, &MainWindow::closeSettings);
+  QObject::connect(settingsWindow, &SettingsWindow::reviewTrainingGuide, [=]() {
+    onboardingWindow->showTrainingGuide();
+    main_layout->setCurrentWidget(onboardingWindow);
+  });
+  QObject::connect(settingsWindow, &SettingsWindow::showDriverView, [=] {
+    homeWindow->showDriverView(true);
+  });
+
   onboardingWindow = new OnboardingWindow(this);
   main_layout->addWidget(onboardingWindow);
   QObject::connect(onboardingWindow, &OnboardingWindow::onboardingDone, [=]() {
@@ -28,7 +39,7 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {
     }
   });
   QObject::connect(device(), &Device::interactiveTimeout, [=]() {
-    if (settingsWindow != nullptr && main_layout->currentWidget() == settingsWindow) {
+    if (main_layout->currentWidget() == settingsWindow) {
       closeSettings();
     }
   });
@@ -54,25 +65,7 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {
   setAttribute(Qt::WA_NoSystemBackground);
 }
 
-void MainWindow::ensureSettingsWindow() {
-  if (settingsWindow != nullptr) {
-    return;
-  }
-
-  settingsWindow = new SettingsWindow(this);
-  main_layout->insertWidget(1, settingsWindow);
-  QObject::connect(settingsWindow, &SettingsWindow::closeSettings, this, &MainWindow::closeSettings);
-  QObject::connect(settingsWindow, &SettingsWindow::reviewTrainingGuide, [=]() {
-    onboardingWindow->showTrainingGuide();
-    main_layout->setCurrentWidget(onboardingWindow);
-  });
-  QObject::connect(settingsWindow, &SettingsWindow::showDriverView, [=] {
-    homeWindow->showDriverView(true);
-  });
-}
-
 void MainWindow::openSettings(int index, const QString &param) {
-  ensureSettingsWindow();
   main_layout->setCurrentWidget(settingsWindow);
   settingsWindow->setCurrentPanel(index, param);
 }

selfdrive/ui/qt/window.h

@@ -15,13 +15,12 @@ public:
 
 private:
   bool eventFilter(QObject *obj, QEvent *event) override;
-  void ensureSettingsWindow();
   void openSettings(int index = 0, const QString &param = "");
   void closeSettings();
 
   QStackedLayout *main_layout;
   HomeWindow *homeWindow;
-  SettingsWindow *settingsWindow = nullptr;
+  SettingsWindow *settingsWindow;
   OnboardingWindow *onboardingWindow;
 
   Params params;