Added U7opendir so ExultStudio will check for upper-case paths

files/utils.cc

@@ -399,6 +399,21 @@ std::FILE *U7open(
 	return 0;
 }
 
+DIR *U7opendir(
+    const char *fname			// May be converted to upper-case.
+) {
+    DIR *dir;
+	string name = get_system_path(fname);
+	int uppercasecount = 0;
+
+	do {
+		dir = opendir(name.c_str()); // Try to open
+		if (dir)
+			return dir; // found it!
+	} while (base_to_uppercase(name, ++uppercasecount));
+	return 0;
+}
+
 /*
  *  Remove a file taking care of paths etc.
  *

files/utils.h

@@ -28,6 +28,7 @@
 #include <cstdio>
 #include <stdio.h>
 #include <iosfwd>
+#include <dirent.h>
 
 #include "common_types.h"
 #include "rect.h"
@@ -562,6 +563,9 @@ bool U7open_static(
     const char *fname,      // May be converted to upper-case.
     bool is_text            // Should file be opened in text mode
 );
+DIR *U7opendir(
+    const char *fname			// May be converted to upper-case.
+);
 void U7remove(
     const char *fname
 );

mapedit/studio.cc

@@ -1356,14 +1356,12 @@ void add_to_tree(GtkTreeStore *model, const char *folderName,
 		}
 
 		string spath("<STATIC>"), ppath("<PATCH>");
-		spath = get_system_path(spath);
-		ppath = get_system_path(ppath);
 		const char *ext = strstr(pattern, "*");
 		if (!ext)
 			ext = pattern;
 		else
 			ext++;
-		DIR *dir = opendir(ppath.c_str());// Get names from 'patch' first.
+		DIR *dir = U7opendir(ppath.c_str());// Get names from 'patch' first.
 		if (dir) {
 			while ((entry = readdir(dir))) {
 				char *fname = entry->d_name;
@@ -1380,7 +1378,7 @@ void add_to_tree(GtkTreeStore *model, const char *folderName,
 			}
 			closedir(dir);
 		}
-		dir = opendir(spath.c_str());   // Now go through 'static'.
+		dir = U7opendir(spath.c_str());   // Now go through 'static'.
 		if (dir) {
 			while ((entry = readdir(dir))) {
 				char *fname = entry->d_name;