From 3583e3d3cd0b6ca2515ada16ca7dcc8cce83031f Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 16 Jan 2018 04:21:51 +0100
Subject: gui: fix paths prior to moving into variant/default

---
 gui/main-window.hpp      | 6 +++---
 gui/process_detector.cpp | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gui/main-window.hpp b/gui/main-window.hpp
index e8863fa4..899fbe0b 100644
--- a/gui/main-window.hpp
+++ b/gui/main-window.hpp
@@ -11,9 +11,9 @@
 #include "export.hpp"
 
 #include "api/plugin-support.hpp"
-#include "mapping-dialog.hpp"
-#include "settings.hpp"
-#include "process_detector.h"
+#include "gui/mapping-dialog.hpp"
+#include "gui/settings.hpp"
+#include "gui/process_detector.h"
 #include "logic/main-settings.hpp"
 #include "logic/pipeline.hpp"
 #include "logic/shortcuts.h"
diff --git a/gui/process_detector.cpp b/gui/process_detector.cpp
index e9f58aad..f7aeb164 100644
--- a/gui/process_detector.cpp
+++ b/gui/process_detector.cpp
@@ -7,8 +7,9 @@
  */
 
 #include "process_detector.h"
-#include "main-window.hpp"
 #include "compat/process-list.hpp"
+#include "options/options.hpp"
+
 #include <QList>
 #include <QFileDialog>
 #include <QComboBox>
@@ -20,6 +21,8 @@
 static constexpr inline auto RECORD_SEPARATOR = QChar(char(0x1e));  // RS ^]
 static constexpr inline auto UNIT_SEPARATOR = QChar(char(0x1f));    // US ^_
 
+using namespace options;
+
 void proc_detector_settings::set_game_list(const QString &game_list)
 {
     group::with_global_settings_object([&](QSettings& settings) {
@@ -79,7 +82,7 @@ void BrowseButton::browse()
                 tr("Set executable name"),
                 dir_path,
                 tr("Executable (*.exe);;All Files (*)"));
-    main_window::set_working_directory();
+    QDir::setCurrent(OPENTRACK_BASE_PATH);
     filename = QFileInfo(filename).fileName();
     if (!filename.isNull())
         twi->setText(filename);
-- 
cgit v1.2.3