ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix indentation + delete contents

This commit is contained in:
WaluigiWare64 2020-07-22 16:01:18 +01:00 committed by GitHub
parent fd4775c3ca
commit c8e934ce97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/frontend/qt_sdl/main.cpp
View File

@ -993,7 +993,8 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
QMenu* menu = menubar->addMenu("File"); QMenu* menu = menubar->addMenu("File");
actOpenROM = menu->addAction("Open ROM..."); actOpenROM = menu->addAction("Open ROM...");
connect(actOpenROM, &QAction::triggered, this, &MainWindow::onOpenFile); connect(actOpenROM, &QAction::triggered, this, &MainWindow::
);
//actBootFirmware = menu->addAction("Launch DS menu"); //actBootFirmware = menu->addAction("Launch DS menu");
actBootFirmware = menu->addAction("Boot firmware"); actBootFirmware = menu->addAction("Boot firmware");
@ -1408,7 +1409,7 @@ std::string extractROM(char* zipName, std::string zipDir){
int err = 0; int err = 0;
zip *z = zip_open(zipName, 0, &err); zip *z = zip_open(zipName, 0, &err);
struct zip_stat st; struct zip_stat st;
zip_stat_init(&st); zip_stat_init(&st);
zip_stat_index(z, 0, 0, &st); //Get information about the file at index 0 zip_stat_index(z, 0, 0, &st); //Get information about the file at index 0
@ -1417,38 +1418,38 @@ std::string extractROM(char* zipName, std::string zipDir){
//Read the compressed file //Read the compressed file
zip_file *f = zip_fopen_index(z, 0, 0); //Open file at index 0 zip_file *f = zip_fopen_index(z, 0, 0); //Open file at index 0
zip_fread(f, contents, st.size); zip_fread(f, contents, st.size);
zip_fclose(f); zip_fclose(f);
zip_close(z); zip_close(z);
//Write the file (binary mode) //Write the file (binary mode)
std::ofstream(zipDir + "/" + st.name, std::ofstream::binary).write(contents, st.size); std::ofstream(zipDir + "/" + st.name, std::ofstream::binary).write(contents, st.size);
delete[] contents;
return zipDir + "/" + st.name; return zipDir + "/" + st.name;
} }
void MainWindow::onOpenFile() void MainWindow::onOpenFile()
{ {
emuThread->emuPause(); emuThread->emuPause();
bool romExtracted = false; //No use yet but may be useful later bool romExtracted = false; //No use yet but may be useful later
QString filename = QFileDialog::getOpenFileName(this, QString filename = QFileDialog::getOpenFileName(this,
"Open ROM", "Open ROM",
Config::LastROMFolder, Config::LastROMFolder,
"DS ROMs (*.nds *.dsi *.srl *.zip);;GBA ROMs (*.gba *.zip);;Any file (*.*)"); "DS ROMs (*.nds *.dsi *.srl *.zip);;GBA ROMs (*.gba *.zip);;Any file (*.*)");
QFileInfo filenameExtLoc = filename; QFileInfo filenameExtLoc = filename;
if (filenameExtLoc.completeSuffix().toUtf8() == "zip") if (filenameExtLoc.completeSuffix().toUtf8() == "zip")
{ {
printf("Extracting ROM from ZIP...\n"); printf("Extracting ROM from ZIP...\n");
std::string extractRomLoc = extractROM(filename.toUtf8().data(), filenameExtLoc.absolutePath().toUtf8().data()); std::string extractRomLoc = extractROM(filename.toUtf8().data(), filenameExtLoc.absolutePath().toUtf8().data());
printf("Done.\n"); printf("Done.\n");
filename = QString::fromUtf8(extractRomLoc.c_str()); filename = QString::fromUtf8(extractRomLoc.c_str());
romExtracted = true; romExtracted = true;
} }
if (filename.isEmpty()) if (filename.isEmpty())
{ {
emuThread->emuUnpause(); emuThread->emuUnpause();
return; return;