diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2010-02-14 14:06:33 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2010-02-14 14:06:33 +0000 |
| commit | 5b1d21d1a15d9dbe7c9dc3e720993817fbd8a465 (patch) | |
| tree | 39448f719e5ac4f05c91cad0760e3302345adbe6 /Source/Core/DiscIO/Src/FileMonitor.cpp | |
| parent | b6aa5d91c0c672c42d2531c8189179089567acc6 (diff) | |
Bunch of tiny memory leaks fixed and cleanup, フウ〜！
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5056 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/FileMonitor.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/FileMonitor.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/Src/FileMonitor.cpp b/Source/Core/DiscIO/Src/FileMonitor.cpp index 906af283c2..854ba8a08d 100644 --- a/Source/Core/DiscIO/Src/FileMonitor.cpp +++ b/Source/Core/DiscIO/Src/FileMonitor.cpp @@ -38,7 +38,7 @@ namespace FileMon
{
-DiscIO::IVolume *OpenISO;
+DiscIO::IVolume *OpenISO = NULL;
DiscIO::IFileSystem *pFileSystem = NULL;
std::vector<const DiscIO::SFileInfo *> GCFiles;
std::string ISOFile = "", CurrentFile = "";
@@ -70,6 +70,18 @@ bool ShowSound(std::string FileName) // Read the GC file system
void ReadGC(std::string FileName)
{
+ // Should have an actual Shutdown procedure or something
+ if(OpenISO != NULL)
+ {
+ delete OpenISO;
+ OpenISO = NULL;
+ }
+ if(pFileSystem != NULL)
+ {
+ delete pFileSystem;
+ pFileSystem = NULL;
+ }
+ // GCFiles' pointers are no longer valid after pFileSystem is cleared
GCFiles.clear();
OpenISO = DiscIO::CreateVolumeFromFilename(FileName);
if (!OpenISO) return;
|