From: Vadim Zeitlin Date: Tue, 5 Jul 2005 15:30:36 +0000 (+0000) Subject: fixed (harmless) assert triggered by renaming the first group in a config file and... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b3a9e150601afb758b8865f57b71f418af6b81b7 fixed (harmless) assert triggered by renaming the first group in a config file and then deleting it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index 4e44795799..c84e60de07 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -1351,8 +1351,11 @@ wxFileConfigGroup::~wxFileConfigGroup() void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine) { - // shouldn't be called twice unless we are resetting the line - wxASSERT( m_pLine == 0 || pLine == 0 ); + // for a normal (i.e. not root) group this method shouldn't be called twice + // unless we are resetting the line + wxASSERT_MSG( !m_pParent || !m_pLine || !pLine, + _T("changing line for a non-root group?") ); + m_pLine = pLine; }