From 8e295ee217c8ef79ff56df91610a83e0178278fc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 21 Apr 2007 15:10:56 +0000 Subject: [PATCH] fix bug with not updating the last line correctly when a group was deleted and recreated (bug 1685312) [backport from HEAD] git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/common/fileconf.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 8d5208f407..9d1f434676 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -94,6 +94,7 @@ Major new features in 2.8 release All (Unix): - Handle socket shutdown by the peer correctly in wxSocket (Tim Kosse) +- Fix bug in wxFileConfig when recreating a group (Steven Van Ingelgem) - Added wxString::char_str() and wchar_str() methods for forward compatiblity with wxWidgets 3 diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index c6168de7c4..3c59583b7e 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -1773,7 +1773,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) m_pLastGroup = NULL; for ( wxFileConfigLineList *pl = pLine->Prev(); - pl && pl != m_pLine && !m_pLastGroup; + pl && !m_pLastGroup; pl = pl->Prev() ) { // does this line belong to our subgroup? @@ -1787,6 +1787,9 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) break; } } + + if ( pl == m_pLine ) + break; } }