The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 22:56:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #629 from RachelBryk/mc-leak

Browse Source 
Fix leaking memory cards.
This commit is contained in:
Lioncash 2014-07-15 16:41:18 -04:00
commit 79e90a1521
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/EXI_DeviceEthernet.cpp
View File

@ -53,9 +53,9 @@ CEXIETHERNET::~CEXIETHERNET()
{
Deactivate();
delete tx_fifo;
delete mBbaMem;
delete mRecvBuffer;
delete[] tx_fifo;
delete[] mBbaMem;
delete[] mRecvBuffer;
}
void CEXIETHERNET::SetCS(int cs)

2
Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp
View File

@ -182,7 +182,7 @@ CEXIMemoryCard::~CEXIMemoryCard()
{
CoreTiming::RemoveEvent(et_this_card);
memorycard->Flush(true);
memorycard.release();
memorycard.reset();
}
bool CEXIMemoryCard::IsPresent()

6
Source/Core/Core/HW/GCMemcardRaw.cpp
View File

@ -69,6 +69,12 @@ MemoryCard::MemoryCard(std::string filename, int _card_index, u16 sizeMb)
}
}
MemoryCard::~MemoryCard()
{
Flush(true);
delete[] memory_card_content;
}
void MemoryCard::joinThread()
{
if (flushThread.joinable())

2
Source/Core/Core/HW/GCMemcardRaw.h
View File

@ -21,7 +21,7 @@ class MemoryCard : public MemoryCardBase
{
public:
MemoryCard(std::string filename, int _card_index, u16 sizeMb = MemCard2043Mb);
~MemoryCard() { Flush(true); }
~MemoryCard();
void Flush(bool exiting = false) override;
s32 Read(u32 address, s32 length, u8 *destaddress) override;