Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-02-22 08:44:53 +01:00
13 changed files with 193 additions and 15 deletions

View File

@@ -160,7 +160,7 @@ bool CEpgScan::AddSelected()
void CEpgScan::AddTransponders()
{
if(bouquetList->Bouquets.empty())
if(!bouquetList || bouquetList->Bouquets.empty())
return;
if (current_mode != g_settings.epg_scan) {