Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)
This commit is contained in:
vanhofen
2017-09-18 21:53:44 +02:00
29 changed files with 50 additions and 499 deletions

View File

@@ -1646,6 +1646,7 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist)
int res = menu_chanlist->exec(NULL, "");
cselected = menu_chanlist->getSelected();
delete channellistNotifier;
delete menu_chanlist;
return res;
}