From 8f2932fb90d084fb5381da9ddc77c33c68cb97ab Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Wed, 15 Aug 2012 18:12:33 +0200 Subject: [PATCH] CHANGED: #1471 CCtrlTextButton created CViewText shouldn't be serialized. --- code/nel/src/gui/ctrl_text_button.cpp | 1 + code/nel/src/gui/interface_parser.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/nel/src/gui/ctrl_text_button.cpp b/code/nel/src/gui/ctrl_text_button.cpp index d8a2b79d1..7143bd51f 100644 --- a/code/nel/src/gui/ctrl_text_button.cpp +++ b/code/nel/src/gui/ctrl_text_button.cpp @@ -508,6 +508,7 @@ namespace NLGUI else _ViewText= new CViewText(CViewBase::TCtorParam()); _ViewText->setId(_Id+"_text"); + _ViewText->setSerializable( false ); _ViewText->parseTextOptions(cur); _ViewText->setAvoidResizeParent(avoidResizeParent()); if(_IsViewTextId) diff --git a/code/nel/src/gui/interface_parser.cpp b/code/nel/src/gui/interface_parser.cpp index 6f74493e2..ff3b77352 100644 --- a/code/nel/src/gui/interface_parser.cpp +++ b/code/nel/src/gui/interface_parser.cpp @@ -1353,8 +1353,7 @@ namespace NLGUI if (parentGroup->getElement(view->getId()) != NULL) { // Remove old groupe and replace - // TODO: Don't save widgets created by complex widgets - if ( true /*reload*/) + if ( reload ) parentGroup->delElement (view->getId()); else {