Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't try to delete our config file in DeleteAll() if we don't have any; don't assert when trying to delete an entry which doesn't exist (for consistency with DeleteGroup() and wxRegConfig)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-10-04 08:53:23 +00:00
parent 45d51f194a
commit c8adf5ef39
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/fileconf.cpp
View File

@@ -1107,13 +1107,19 @@ bool wxFileConfig::DeleteAll()
{
CleanUp();
if ( wxFile::Exists(m_strLocalFile) && wxRemove(m_strLocalFile) == -1 )
if ( !m_strLocalFile.empty() )
{
wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
return false;
if ( wxFile::Exists(m_strLocalFile) && wxRemove(m_strLocalFile) == -1 )
{
wxLogSysError(_("can't delete user configuration file '%s'"),
m_strLocalFile.c_str());
return false;
}
m_strLocalFile =
m_strGlobalFile = wxT("");
}
m_strLocalFile = m_strGlobalFile = wxT("");
Init();
return true;
@@ -1709,7 +1715,11 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
bool wxFileConfigGroup::DeleteEntry(const wxChar *szName)
{
wxFileConfigEntry *pEntry = FindEntry(szName);
wxCHECK( pEntry != NULL, false ); // deleting non existing item?
if ( !pEntry )
{
// entry doesn't exist, nothing to do
return false;
}
wxFileConfigLineList *pLine = pEntry->GetLine();
if ( pLine != NULL ) {