diff options
| author | louis <louis.braun@gmx.de> | 2015-05-22 14:58:51 +0200 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2015-05-22 14:58:51 +0200 |
| commit | 0936766c7be02661f1cd678fdd1b6fb22b5d122c (patch) | |
| tree | 7bdafa6c4b020a05e1d62be9159034324a746aa6 /views | |
| parent | 5c365b57620282a2bfc52b77a5d22aea1bbbc46b (diff) | |
| parent | d405f84b550e6da420c66c3d3a0318efe43de8de (diff) | |
| download | vdr-plugin-skindesigner-0936766c7be02661f1cd678fdd1b6fb22b5d122c.tar.gz vdr-plugin-skindesigner-0936766c7be02661f1cd678fdd1b6fb22b5d122c.tar.bz2 | |
Merge branch 'master' into installer
Diffstat (limited to 'views')
| -rw-r--r-- | views/displaymenurootview.c | 1 | ||||
| -rw-r--r-- | views/viewhelpers.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/views/displaymenurootview.c b/views/displaymenurootview.c index 6de16c7..6a19433 100644 --- a/views/displaymenurootview.c +++ b/views/displaymenurootview.c @@ -38,7 +38,6 @@ cDisplayMenuRootView::cDisplayMenuRootView(cTemplateView *rootView) : cView(root } cDisplayMenuRootView::~cDisplayMenuRootView() { - CancelSave(); if (view) { delete view; view = NULL; diff --git a/views/viewhelpers.c b/views/viewhelpers.c index cc72c9b..d504dad 100644 --- a/views/viewhelpers.c +++ b/views/viewhelpers.c @@ -873,7 +873,7 @@ void cViewHelpers::SetLastRecordings(map<string,int> *intTokens, map<string,stri recVals.insert(pair< string, string >("recordings[posterheight]", sPosterHeight.str())); lastRecordings->push_back(recVals); found++; - if (found == 5) + if (found == 10) break; } } @@ -938,7 +938,7 @@ bool cViewHelpers::SetEcmInfos(int channelSid, stringmap &stringTokens, intmap & return false; } - if (ecmInfo.hops < 0 || ecmInfo.ecmtime <= 0) + if (ecmInfo.hops < 0 || ecmInfo.ecmtime <= 0 || ecmInfo.ecmtime > 100000) return false; if (CompareECMInfos(&ecmInfo)) return false; |