summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDante38490 <dante38@free.fr>2015-01-05 04:39:42 +0100
committerDante38490 <dante38@free.fr>2015-01-05 04:39:42 +0100
commit35a085d567d3c64163b1d3316c2a481a0fb0b9dd (patch)
tree7833f622204dad4f7c0aef1705e7bbadea521d72
parentMerge pull request #386 from archshift/y2ru (diff)
downloadyuzu-35a085d567d3c64163b1d3316c2a481a0fb0b9dd.tar
yuzu-35a085d567d3c64163b1d3316c2a481a0fb0b9dd.tar.gz
yuzu-35a085d567d3c64163b1d3316c2a481a0fb0b9dd.tar.bz2
yuzu-35a085d567d3c64163b1d3316c2a481a0fb0b9dd.tar.lz
yuzu-35a085d567d3c64163b1d3316c2a481a0fb0b9dd.tar.xz
yuzu-35a085d567d3c64163b1d3316c2a481a0fb0b9dd.tar.zst
yuzu-35a085d567d3c64163b1d3316c2a481a0fb0b9dd.zip
-rw-r--r--src/citra_qt/main.cpp2
-rw-r--r--src/core/loader/loader.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 88f959d9a..64e389f25 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -179,7 +179,7 @@ void GMainWindow::BootGame(std::string filename)
void GMainWindow::OnMenuLoadFile()
{
- QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3dsx *.elf *.axf *.bin *.cci *.cxi)"));
+ QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3ds *.3dsx *.elf *.axf *.bin *.cci *.cxi)"));
if (filename.size())
BootGame(filename.toLatin1().data());
}
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 87580cb2a..ab4374307 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -45,6 +45,8 @@ FileType IdentifyFile(const std::string &filename) {
return FileType::CCI;
} else if (extension == ".bin") {
return FileType::BIN;
+ } else if (extension == ".3ds") {
+ return FileType::CCI;
} else if (extension == ".3dsx") {
return FileType::THREEDSX;
}