M CHANGES → CHANGES

@@ -12,6 +12,7 @@ - Qt: Fix locale being set to English on settings save (fixes mgba.io/i/906)
  - LR35902: Fix watchpoints not reporting new value
  - GBA Audio: Increase PSG volume (fixes mgba.io/i/932)
  - GBA BIOS: Fix incorrect exit condition in LZ77
+ - 3DS: Fix opening files in directory names with trailing slashes
 Misc:
  - GBA: Improve multiboot image detection
  - GB MBC: Remove erroneous bank 0 wrapping

M src/platform/3ds/3ds-vfs.c → src/platform/3ds/3ds-vfs.c

@@ -241,7 +241,11 @@ return 0;
 	}
 	const char* dir = vd3d->path;
 	char* combined = malloc(sizeof(char) * (strlen(path) + strlen(dir) + 2));
-	sprintf(combined, "%s/%s", dir, path);
+	if (dir[strlen(dir) - 1] == '/') {
+		sprintf(combined, "%s%s", dir, path);
+	} else {
+		sprintf(combined, "%s/%s", dir, path);
+	}
 
 	struct VFile* file = VFileOpen(combined, mode);
 	free(combined);
@@ -255,7 +259,11 @@ return 0;
 	}
 	const char* dir = vd3d->path;
 	char* combined = malloc(sizeof(char) * (strlen(path) + strlen(dir) + 2));
-	sprintf(combined, "%s/%s", dir, path);
+	if (dir[strlen(dir) - 1] == '/') {
+		sprintf(combined, "%s%s", dir, path);
+	} else {
+		sprintf(combined, "%s/%s", dir, path);
+	}
 
 	struct VDir* vd2 = VDirOpen(combined);
 	if (!vd2) {
@@ -272,7 +280,11 @@ return 0;
 	}
 	const char* dir = vd3d->path;
 	char* combined = malloc(sizeof(char) * (strlen(path) + strlen(dir) + 2));
-	sprintf(combined, "%s/%s", dir, path);
+	if (dir[strlen(dir) - 1] == '/') {
+		sprintf(combined, "%s%s", dir, path);
+	} else {
+		sprintf(combined, "%s/%s", dir, path);
+	}
 
 	uint16_t utf16Path[PATH_MAX + 1];
 	ssize_t units = utf8_to_utf16(utf16Path, (const uint8_t*) combined, PATH_MAX);