Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[desktop] Prefer extracred folder name over zip name for non-Atmosphere zip mods (#4043)

crueter27189f39d2bf
diff --git a/src/frontend_common/mod_manager.cpp b/src/frontend_common/mod_manager.cpp
index 35d7068f2f..b1adaebf91 100644
--- a/src/frontend_common/mod_manager.cpp
+++ b/src/frontend_common/mod_manager.cpp
@@ -3,7 +3,6 @@
#include <algorithm>
#include <filesystem>
-#include <iostream>
#include <fmt/format.h>
#include "common/fs/fs.h"
#include "common/fs/fs_types.h"
diff --git a/src/qt_common/util/mod.cpp b/src/qt_common/util/mod.cpp
index 3e75cb21fa..c09b39cf82 100644
--- a/src/qt_common/util/mod.cpp
+++ b/src/qt_common/util/mod.cpp
@@ -33,10 +33,13 @@ QStringList GetModFolders(const QString& root, const QString& fallbackName) {
std_path = paths[0];
QString default_name;
- if (!fallbackName.isEmpty())
- default_name = fallbackName;
- else if (!paths.empty())
+
+ // If this is an atmosphere-packed mod, the default name will end up as the game's title ID.
+ // So in this case ignore it and use the zip name instead
+ if (!paths.empty() && std_path.string().find("atmosphere") == std::string::npos)
default_name = QString::fromStdString(std_path.filename().string());
+ else if (!fallbackName.isEmpty())
+ default_name = fallbackName;
else
default_name = root.split(QLatin1Char('/')).last();