From a0215153856903e53890edd938374f49ca96d5ae Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 14 Mar 2015 06:37:11 +0100 Subject: [PATCH] fixed crash when opening and closing main menu consecutively --- HISTORY | 1 + libtemplate/xmlparser.c | 7 ------- views/displaymenurootview.c | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/HISTORY b/HISTORY index 7f518fe..83765bb 100644 --- a/HISTORY +++ b/HISTORY @@ -210,4 +210,5 @@ Version 0.3.0 - checking setup conditions for viewelements - fixed FadeOut bug +- fixed crash when opening and closing main menu consecutively diff --git a/libtemplate/xmlparser.c b/libtemplate/xmlparser.c index f5f3d6e..4aa0a81 100644 --- a/libtemplate/xmlparser.c +++ b/libtemplate/xmlparser.c @@ -965,13 +965,6 @@ bool cXmlParser::ParseAttributes(xmlAttrPtr attr, xmlNodePtr node, vectorname; - /* - if (!name.compare("debug")) { - attribs.push_back(pair((const char*)attr->name, "true")); - attr = attr->next; - continue; - } - */ xmlChar *value = NULL; value = xmlGetProp(node, attr->name); if (!view->ValidAttribute(isViewElement ? "viewelement" : (const char*)node->name, (const char*)attr->name)) { diff --git a/views/displaymenurootview.c b/views/displaymenurootview.c index 2f40bc9..aaef353 100644 --- a/views/displaymenurootview.c +++ b/views/displaymenurootview.c @@ -31,6 +31,7 @@ cDisplayMenuRootView::cDisplayMenuRootView(cTemplateView *rootView) : cView(root } cDisplayMenuRootView::~cDisplayMenuRootView() { + CancelSave(); if (view) { delete view; view = NULL;