Merge pull request #415 from Dante38490/master

Loader: Add support for loading NCCH ROMs with the .3DS extension

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());
 }

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;
     }