From e239e7aded5ba1b9f649b1f31d6b7fcc1cdff689 Mon Sep 17 00:00:00 2001
From: Herp Derpinstine <herpderpinstine@gmail.com>
Date: Fri, 11 Oct 2024 03:30:38 -0600
Subject: [PATCH] Moved dobby scan to check Game Directory after Base Directory

---
 MelonProxy/src/utils/files.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/MelonProxy/src/utils/files.rs b/MelonProxy/src/utils/files.rs
index bc5e79c3..1fdea916 100644
--- a/MelonProxy/src/utils/files.rs
+++ b/MelonProxy/src/utils/files.rs
@@ -25,14 +25,6 @@ pub fn get_bootstrap_path(base_path: &PathBuf) -> Result<PathBuf, io::Error> {
 /// search for Bootstrap in the given path
 pub fn get_dobby_dir(base_path: PathBuf, game_dir: PathBuf) -> Result<PathBuf, io::Error> {
     let dobby_names = ["dobby", "libdobby"]; //by convention, on unix, the library is prefixed with "lib"
-
-    for name in dobby_names.iter() {
-        let dobby_path = game_dir.join(name).with_extension(DLL_EXTENSION);
-
-        if dobby_path.exists() {
-            return Ok(game_dir);
-        }
-    }
 	
     for name in dobby_names.iter() {
         let dobby_path = base_path.join(name).with_extension(DLL_EXTENSION);
@@ -59,6 +51,14 @@ pub fn get_dobby_dir(base_path: PathBuf, game_dir: PathBuf) -> Result<PathBuf, i
             return Ok(path);
         }
     }
+	
+    for name in dobby_names.iter() {
+        let dobby_path = game_dir.join(name).with_extension(DLL_EXTENSION);
+
+        if dobby_path.exists() {
+            return Ok(game_dir);
+        }
+    }
 
     Err(io::Error::new(
         ErrorKind::NotFound,