Merge branch 'master' into pu/fb-modules

This commit is contained in:
M. Liebmann
2017-02-09 22:58:09 +01:00
3 changed files with 46 additions and 63 deletions

View File

@@ -2661,7 +2661,7 @@ void CChannelList::deleteChannel(bool ask)
if (!bouquet || !bouquet->zapitBouquet)
return;
if (ask && ShowMsg(LOCALE_FILEBROWSER_DELETE, (*chanlist)[selected]->getName(), CMsgBox::mbrYes, CMsgBox::mbNoYes)!=CMsgBox::mbrYes)
if (ask && ShowMsg(LOCALE_FILEBROWSER_DELETE, (*chanlist)[selected]->getName(), CMsgBox::mbrNo, CMsgBox::mbYes|CMsgBox::mbNo)!=CMsgBox::mbrYes)
return;
bouquet->zapitBouquet->removeService((*chanlist)[selected]->getChannelID());