mirror of
https://github.com/melonDS-emu/melonDS.git
synced 2025-07-26 15:50:00 -06:00
main : Allocate rombuffer objects on stack
* Less messy, decreases chances of memory leaks * Underlying implementation of qbytearray uses heap (hopefully?) Signed-off-by: Madhav Kanbur <abcdjdj@gmail.com>
This commit is contained in:
@ -1645,14 +1645,12 @@ void MainWindow::onOpenFileArchive()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
QByteArray *romBuffer = new QByteArray();
|
QByteArray romBuffer;
|
||||||
QString romFileName = pickAndExtractFileFromArchive(archiveFileName, romBuffer);
|
QString romFileName = pickAndExtractFileFromArchive(archiveFileName, &romBuffer);
|
||||||
if(!romFileName.isEmpty())
|
if(!romFileName.isEmpty())
|
||||||
{
|
{
|
||||||
loadROM(romBuffer, archiveFileName, romFileName);
|
loadROM(&romBuffer, archiveFileName, romFileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
delete romBuffer;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString MainWindow::pickAndExtractFileFromArchive(QString archiveFileName, QByteArray *romBuffer)
|
QString MainWindow::pickAndExtractFileFromArchive(QString archiveFileName, QByteArray *romBuffer)
|
||||||
@ -1753,14 +1751,13 @@ void MainWindow::onClickRecentFile()
|
|||||||
{
|
{
|
||||||
// Archives
|
// Archives
|
||||||
QString archiveFileName = fileName;
|
QString archiveFileName = fileName;
|
||||||
QByteArray *romBuffer = new QByteArray;
|
QByteArray romBuffer;
|
||||||
QString romFileName = MainWindow::pickAndExtractFileFromArchive(archiveFileName, romBuffer);
|
QString romFileName = MainWindow::pickAndExtractFileFromArchive(archiveFileName, &romBuffer);
|
||||||
if(!romFileName.isEmpty())
|
if(!romFileName.isEmpty())
|
||||||
{
|
{
|
||||||
emuThread->emuPause();
|
emuThread->emuPause();
|
||||||
loadROM(romBuffer, archiveFileName, romFileName);
|
loadROM(&romBuffer, archiveFileName, romFileName);
|
||||||
}
|
}
|
||||||
delete romBuffer;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user