From 5bac1f771c1fdbea44d48c5da969fbc8158142f4 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Tue, 12 Sep 2023 04:18:40 +0800
Subject: [PATCH] cabana: use applicationPath for settings (#29875)

old-commit-hash: 5e1b5b36e48f3b7c776b843993071e24a9d1466e
---
 tools/cabana/cabana.cc   | 2 ++
 tools/cabana/settings.cc | 8 ++------
 tools/cabana/settings.h  | 4 +++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/cabana/cabana.cc b/tools/cabana/cabana.cc
index 33403a2bff..0ccef7d3ab 100644
--- a/tools/cabana/cabana.cc
+++ b/tools/cabana/cabana.cc
@@ -18,6 +18,8 @@ int main(int argc, char *argv[]) {
   app.setWindowIcon(QIcon(":cabana-icon.png"));
 
   UnixSignalHandler signalHandler;
+
+  settings.load();
   utils::setTheme(settings.theme);
 
   QCommandLineParser cmd_parser;
diff --git a/tools/cabana/settings.cc b/tools/cabana/settings.cc
index d0cada680a..027dcb903f 100644
--- a/tools/cabana/settings.cc
+++ b/tools/cabana/settings.cc
@@ -13,12 +13,8 @@
 
 Settings settings;
 
-Settings::Settings() {
-  load();
-}
-
 void Settings::save() {
-  QSettings s("settings", QSettings::IniFormat);
+  QSettings s(filePath(), QSettings::IniFormat);
   s.setValue("fps", fps);
   s.setValue("max_cached_minutes", max_cached_minutes);
   s.setValue("chart_height", chart_height);
@@ -42,7 +38,7 @@ void Settings::save() {
 }
 
 void Settings::load() {
-  QSettings s("settings", QSettings::IniFormat);
+  QSettings s(filePath(), QSettings::IniFormat);
   fps = s.value("fps", 10).toInt();
   max_cached_minutes = s.value("max_cached_minutes", 30).toInt();
   chart_height = s.value("chart_height", 200).toInt();
diff --git a/tools/cabana/settings.h b/tools/cabana/settings.h
index b8a3797f86..f9eaa8ffad 100644
--- a/tools/cabana/settings.h
+++ b/tools/cabana/settings.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <QApplication>
 #include <QByteArray>
 #include <QCheckBox>
 #include <QComboBox>
@@ -22,9 +23,10 @@ public:
     AlwaysBE,
   };
 
-  Settings();
+  Settings() {}
   void save();
   void load();
+  inline static QString filePath() { return QApplication::applicationDirPath() + "/settings"; }
 
   int fps = 10;
   int max_cached_minutes = 30;