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

[Project64] Make sure 7z in rombrowser is win32 only

This commit is contained in:
zilmar 2016-04-15 08:29:45 +10:00
parent 3007139446
commit 71454df424
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Project64/UserInterface/RomList.cpp
View File

@ -31,7 +31,9 @@ CRomList::CRomList() :
m_RefreshThread(NULL), m_RefreshThread(NULL),
m_NotesIniFile(NULL), m_NotesIniFile(NULL),
m_ExtIniFile(NULL), m_ExtIniFile(NULL),
#ifdef _WIN32
m_ZipIniFile(NULL), m_ZipIniFile(NULL),
#endif
m_RomIniFile(NULL), m_RomIniFile(NULL),
m_WatchThreadID(0), m_WatchThreadID(0),
m_WatchThread(NULL), m_WatchThread(NULL),
@ -42,7 +44,9 @@ CRomList::CRomList() :
m_NotesIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_Notes).c_str()); m_NotesIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_Notes).c_str());
m_ExtIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_ExtInfo).c_str()); m_ExtIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_ExtInfo).c_str());
m_RomIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str()); m_RomIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str());
#ifdef _WIN32
m_ZipIniFile = new CIniFile(g_Settings->LoadStringVal(RomList_7zipCache).c_str()); m_ZipIniFile = new CIniFile(g_Settings->LoadStringVal(RomList_7zipCache).c_str());
#endif
} }
} }
@ -65,11 +69,13 @@ CRomList::~CRomList()
delete m_RomIniFile; delete m_RomIniFile;
m_RomIniFile = NULL; m_RomIniFile = NULL;
} }
#ifdef _WIN32
if (m_ZipIniFile) if (m_ZipIniFile)
{ {
delete m_ZipIniFile; delete m_ZipIniFile;
m_ZipIniFile = NULL; m_ZipIniFile = NULL;
} }
#endif
} }
void CRomList::RefreshRomList(void) void CRomList::RefreshRomList(void)

2
Source/Project64/UserInterface/RomList.h
View File

@ -93,7 +93,9 @@ private:
CIniFile * m_NotesIniFile; CIniFile * m_NotesIniFile;
CIniFile * m_ExtIniFile; CIniFile * m_ExtIniFile;
CIniFile * m_RomIniFile; CIniFile * m_RomIniFile;
#ifdef _WIN32
CIniFile * m_ZipIniFile; CIniFile * m_ZipIniFile;
#endif
HANDLE m_RefreshThread; HANDLE m_RefreshThread;
stdstr m_WatchRomDir; stdstr m_WatchRomDir;