diff options
| author | louis <louis.braun@gmx.de> | 2015-03-14 06:37:11 +0100 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2015-03-14 06:37:11 +0100 |
| commit | a0215153856903e53890edd938374f49ca96d5ae (patch) | |
| tree | c0cfd3735ae6407bf551ffe216e99e3910499308 | |
| parent | d5a91f36dc6387e51e74982e8087be7b04d585a2 (diff) | |
| download | vdr-plugin-skindesigner-a0215153856903e53890edd938374f49ca96d5ae.tar.gz vdr-plugin-skindesigner-a0215153856903e53890edd938374f49ca96d5ae.tar.bz2 | |
fixed crash when opening and closing main menu consecutively
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | libtemplate/xmlparser.c | 7 | ||||
| -rw-r--r-- | views/displaymenurootview.c | 1 |
3 files changed, 2 insertions, 7 deletions
@@ -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, vector<pair<s while (NULL != attr) { string name = (const char*)attr->name; - /* - if (!name.compare("debug")) { - attribs.push_back(pair<string, string>((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; |
