diff --git a/dist/citra.xml b/dist/citra.xml index 6d47c8760..aad26254a 100644 --- a/dist/citra.xml +++ b/dist/citra.xml @@ -16,7 +16,6 @@ CTR Cart Image - diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/Game.kt b/src/android/app/src/main/java/org/citra/citra_emu/model/Game.kt index 689b4ec25..7fb6825dd 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/model/Game.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/model/Game.kt @@ -63,7 +63,7 @@ class Game( val allExtensions: Set get() = extensions + badExtensions val extensions: Set = HashSet( - listOf("3ds", "3dsx", "elf", "axf", "cci", "cxi", "app") + listOf("3dsx", "elf", "axf", "cci", "cxi", "app") ) val badExtensions: Set = HashSet( diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp index 4ed41742d..0b3c78f70 100644 --- a/src/citra_qt/citra_qt.cpp +++ b/src/citra_qt/citra_qt.cpp @@ -3404,8 +3404,8 @@ static bool IsSingleFileDropEvent(const QMimeData* mime) { return mime->hasUrls() && mime->urls().length() == 1; } -static const std::array AcceptedExtensions = {"cci", "3ds", "cxi", "bin", - "3dsx", "app", "elf", "axf"}; +static const std::array AcceptedExtensions = {"cci", "cxi", "bin", "3dsx", + "app", "elf", "axf"}; static bool IsCorrectFileExtension(const QMimeData* mime) { const QString& filename = mime->urls().at(0).toLocalFile(); diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index f520e4f00..c1f848b47 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -48,7 +48,7 @@ FileType GuessFromExtension(const std::string& extension_) { if (extension == ".elf" || extension == ".axf") return FileType::ELF; - if (extension == ".cci" || extension == ".3ds") + if (extension == ".cci") return FileType::CCI; if (extension == ".cxi" || extension == ".app") diff --git a/src/tests/common/file_util.cpp b/src/tests/common/file_util.cpp index 8a9ea2a86..bd7fcbdd9 100644 --- a/src/tests/common/file_util.cpp +++ b/src/tests/common/file_util.cpp @@ -11,7 +11,7 @@ #include "common/string_util.h" TEST_CASE("SplitFilename83 Sanity", "[common]") { - std::string filename = "long_ass_file_name.3ds"; + std::string filename = "long_ass_file_name.cci"; std::array short_name; std::array extension;