From d47fc5c973b5b17289c4915e911c4412956361ea Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 27 Nov 2019 16:37:58 -0500
Subject: allow relative paths for binaries in the executables settings added
 SSAudioOSD.dll to checks

---
 src/editexecutablesdialog.cpp | 2 +-
 src/executableslist.cpp       | 6 +++---
 src/sanitychecks.cpp          | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/editexecutablesdialog.cpp b/src/editexecutablesdialog.cpp
index 32b31357..1c804a7c 100644
--- a/src/editexecutablesdialog.cpp
+++ b/src/editexecutablesdialog.cpp
@@ -327,7 +327,7 @@ void EditExecutablesDialog::clearEdits()
 void EditExecutablesDialog::setEdits(const Executable& e)
 {
   ui->title->setText(e.title());
-  ui->binary->setText(QDir::toNativeSeparators(e.binaryInfo().absoluteFilePath()));
+  ui->binary->setText(QDir::toNativeSeparators(e.binaryInfo().filePath()));
   ui->workingDirectory->setText(QDir::toNativeSeparators(e.workingDirectory()));
   ui->arguments->setText(e.arguments());
   ui->overwriteSteamAppID->setChecked(!e.steamAppID().isEmpty());
diff --git a/src/executableslist.cpp b/src/executableslist.cpp
index 1be34b53..75f29e8f 100644
--- a/src/executableslist.cpp
+++ b/src/executableslist.cpp
@@ -120,7 +120,7 @@ void ExecutablesList::store(Settings& s)
     map["toolbar"] = item.isShownOnToolbar();
     map["ownicon"] = item.usesOwnIcon();
     map["hide"] = item.hide();
-    map["binary"] = item.binaryInfo().absoluteFilePath();
+    map["binary"] = item.binaryInfo().filePath();
     map["arguments"] = item.arguments();
     map["workingDirectory"] = item.workingDirectory();
     map["steamAppID"] = item.steamAppID();
@@ -358,7 +358,7 @@ void ExecutablesList::dump() const
       "    steam ID: {}\n"
       "    directory: {}\n"
       "    flags: {} ({})",
-      e.title(), e.binaryInfo().absoluteFilePath(), e.arguments(),
+      e.title(), e.binaryInfo().filePath(), e.arguments(),
       e.steamAppID(), e.workingDirectory(), flags.join("|"), e.flags());
   }
 }
@@ -374,7 +374,7 @@ Executable::Executable(const MOBase::ExecutableInfo& info, Flags flags) :
   m_binaryInfo(info.binary()),
   m_arguments(info.arguments().join(" ")),
   m_steamAppID(info.steamAppID()),
-  m_workingDirectory(info.workingDirectory().absolutePath()),
+  m_workingDirectory(info.workingDirectory().path()),
   m_flags(flags)
 {
 }
diff --git a/src/sanitychecks.cpp b/src/sanitychecks.cpp
index a767e8f9..330735ed 100644
--- a/src/sanitychecks.cpp
+++ b/src/sanitychecks.cpp
@@ -222,7 +222,8 @@ int checkIncompatibleModule(const env::Module& m)
 
   static const std::map<QString, QString> names = {
     {"NahimicOSD.dll", "Nahimic"},
-    {"RTSSHooks64.dll", "RivaTuner Statistics Server"}
+    {"RTSSHooks64.dll", "RivaTuner Statistics Server"},
+    {"SSAudioOSD.dll", "SteelSeries Audio"}
   };
 
   const QFileInfo file(m.path());
-- 
cgit v1.3.1