From b629ff2b9e6db8c956d401c67b75bdf5453dd2a3 Mon Sep 17 00:00:00 2001
From: Tim Kosse <tim.kosse@gmx.de>
Date: Sun, 6 Jul 2014 10:01:38 +0000
Subject: [PATCH] Do not assert if not editing a label when calling
 wxGenericTreeCtrl::EndEditLabel

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/treectlg.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index f163333bc1..6af661ca48 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -3510,9 +3510,10 @@ wxTextCtrl* wxGenericTreeCtrl::GetEditControl() const
 void wxGenericTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item),
                                      bool discardChanges)
 {
-    wxCHECK_RET( m_textCtrl, wxT("not editing label") );
-
-    m_textCtrl->EndEdit(discardChanges);
+    if (m_textCtrl)
+    {
+        m_textCtrl->EndEdit(discardChanges);
+    }
 }
 
 bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,