From 94651bab91c42a168e0cc5cf42cd18007a30b190 Mon Sep 17 00:00:00 2001
From: Rosalie Wanders <rosalie@mailbox.org>
Date: Thu, 13 Jan 2022 16:01:45 +0100
Subject: [PATCH] RMG-Core: use CoreGetPluginDirectory() in Settings.cpp for
 plugins

---
 Source/RMG-Core/Settings/Settings.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/RMG-Core/Settings/Settings.cpp b/Source/RMG-Core/Settings/Settings.cpp
index 452f684f..ec73f94e 100644
--- a/Source/RMG-Core/Settings/Settings.cpp
+++ b/Source/RMG-Core/Settings/Settings.cpp
@@ -151,36 +151,36 @@ static l_Setting get_setting(SettingsID settingId)
     case SettingsID::Core_GFX_Plugin:
         setting = {SETTING_SECTION_CORE, "GFX_Plugin", 
 #ifdef _WIN32
-                    "Plugin\\GFX\\mupen64plus-video-GLideN64.dll",
+                    CoreGetPluginDirectory() + "\\GFX\\mupen64plus-video-GLideN64.dll",
 #else
-                    "Plugin/GFX/mupen64plus-video-GLideN64.so", 
+                    CoreGetPluginDirectory() + "/GFX/mupen64plus-video-GLideN64.so", 
 #endif // _WIN32
                   };
         break;
     case SettingsID::Core_AUDIO_Plugin:
         setting = {SETTING_SECTION_CORE, "AUDIO_Plugin", 
 #ifdef _WIN32
-                    "Plugin\\Audio\\RMG-Audio.dll",
+                    CoreGetPluginDirectory() + "\\Audio\\RMG-Audio.dll",
 #else
-                    "Plugin/Audio/RMG-Audio.so",
+                    CoreGetPluginDirectory() + "/Audio/RMG-Audio.so",
 #endif // _WIN32
                   };
         break;
     case SettingsID::Core_INPUT_Plugin:
         setting = {SETTING_SECTION_CORE, "INPUT_Plugin", 
 #ifdef _WIN32
-                    "Plugin\\Input\\libmupen64plus-input-qt.dll",
+                    CoreGetPluginDirectory() + "\\Input\\libmupen64plus-input-qt.dll",
 #else
-                    "Plugin/Input/libmupen64plus-input-qt.so",
+                    CoreGetPluginDirectory() + "/Input/libmupen64plus-input-qt.so",
 #endif // _WIN32
                   };
         break;
     case SettingsID::Core_RSP_Plugin:
         setting = {SETTING_SECTION_CORE, "RSP_Plugin", 
 #ifdef _WIN32
-                    "Plugin\\RSP\\mupen64plus-rsp-hle.dll",
+                    CoreGetPluginDirectory() + "\\RSP\\mupen64plus-rsp-hle.dll",
 #else
-                    "Plugin/RSP/mupen64plus-rsp-hle.so",
+                    CoreGetPluginDirectory() + "/RSP/mupen64plus-rsp-hle.so",
 #endif // _WIN32
                   };
         break;