From 46b8b00b5e36bf2cb20600dc0227b2a7be2e1783 Mon Sep 17 00:00:00 2001 From: George Tasker Date: Wed, 16 Jan 2002 13:40:19 +0000 Subject: [PATCH] Minor cleanup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xml.cpp | 6 ++++-- src/xrc/xml.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/src/xrc/xml.cpp b/contrib/src/xrc/xml.cpp index cf48cf0038..bc3bc6af58 100644 --- a/contrib/src/xrc/xml.cpp +++ b/contrib/src/xrc/xml.cpp @@ -256,12 +256,14 @@ void wxXmlNode::AddProperty(wxXmlProperty *prop) bool wxXmlNode::DeleteProperty(const wxString& name) { + wxXmlProperty *prop; + if (m_properties == NULL) return FALSE; else if (m_properties->GetName() == name) { - wxXmlProperty *prop = m_properties; + prop = m_properties; m_properties = prop->GetNext(); prop->SetNext(NULL); delete prop; @@ -275,7 +277,7 @@ bool wxXmlNode::DeleteProperty(const wxString& name) { if (p->GetNext()->GetName() == name) { - wxXmlProperty *prop = p->GetNext(); + prop = p->GetNext(); p->SetNext(prop->GetNext()); prop->SetNext(NULL); delete prop; diff --git a/src/xrc/xml.cpp b/src/xrc/xml.cpp index cf48cf0038..bc3bc6af58 100644 --- a/src/xrc/xml.cpp +++ b/src/xrc/xml.cpp @@ -256,12 +256,14 @@ void wxXmlNode::AddProperty(wxXmlProperty *prop) bool wxXmlNode::DeleteProperty(const wxString& name) { + wxXmlProperty *prop; + if (m_properties == NULL) return FALSE; else if (m_properties->GetName() == name) { - wxXmlProperty *prop = m_properties; + prop = m_properties; m_properties = prop->GetNext(); prop->SetNext(NULL); delete prop; @@ -275,7 +277,7 @@ bool wxXmlNode::DeleteProperty(const wxString& name) { if (p->GetNext()->GetName() == name) { - wxXmlProperty *prop = p->GetNext(); + prop = p->GetNext(); p->SetNext(prop->GetNext()); prop->SetNext(NULL); delete prop; -- 2.47.2