mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
fixed Bug that double vars were not handled correctly
This commit is contained in:
parent
d0868978bc
commit
705eefc1f0
6
HISTORY
6
HISTORY
@ -184,3 +184,9 @@ Version 0.1.6
|
|||||||
or more skin names start identically
|
or more skin names start identically
|
||||||
|
|
||||||
Version 0.2.0
|
Version 0.2.0
|
||||||
|
|
||||||
|
- fixed Bug that double vars were not handled correctly
|
||||||
|
- fixed Bug that calling mplayer plugin via keymacros.conf causes segfault
|
||||||
|
|
||||||
|
Version 0.2.1
|
||||||
|
|
||||||
|
@ -112,6 +112,11 @@ void cGlobals::ReplaceDoubleVars(string &value) {
|
|||||||
stringstream st;
|
stringstream st;
|
||||||
st << it->second;
|
st << it->second;
|
||||||
string doubleVal = st.str();
|
string doubleVal = st.str();
|
||||||
|
if (config.replaceDecPoint) {
|
||||||
|
if (doubleVal.find_first_of('.') != string::npos) {
|
||||||
|
std::replace( doubleVal.begin(), doubleVal.end(), '.', config.decPoint);
|
||||||
|
}
|
||||||
|
}
|
||||||
value = value.replace(foundToken, token.size(), doubleVal);
|
value = value.replace(foundToken, token.size(), doubleVal);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,12 +31,18 @@ cDisplayMenuRootView::cDisplayMenuRootView(cTemplateView *rootView) : cView(root
|
|||||||
}
|
}
|
||||||
|
|
||||||
cDisplayMenuRootView::~cDisplayMenuRootView() {
|
cDisplayMenuRootView::~cDisplayMenuRootView() {
|
||||||
if (view)
|
if (view) {
|
||||||
delete view;
|
delete view;
|
||||||
if (listView)
|
view = NULL;
|
||||||
|
}
|
||||||
|
if (listView) {
|
||||||
delete listView;
|
delete listView;
|
||||||
if (detailView)
|
listView = NULL;
|
||||||
|
}
|
||||||
|
if (detailView) {
|
||||||
delete detailView;
|
delete detailView;
|
||||||
|
detailView = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*******************************************************************
|
/*******************************************************************
|
||||||
@ -337,7 +343,7 @@ void cDisplayMenuRootView::Clear(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cDisplayMenuRootView::ClearRootView(void) {
|
void cDisplayMenuRootView::ClearRootView(void) {
|
||||||
if (defaultBackgroundDrawn && view->BackgroundImplemented())
|
if (defaultBackgroundDrawn && view && view->BackgroundImplemented())
|
||||||
ClearViewElement(veBackground);
|
ClearViewElement(veBackground);
|
||||||
if (defaultHeaderDrawn)
|
if (defaultHeaderDrawn)
|
||||||
ClearViewElement(veHeader);
|
ClearViewElement(veHeader);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user