mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-04 12:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: c28991d0fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-17 (Fri, 17 Feb 2017)
This commit is contained in:
vanhofen
2017-02-17 17:44:29 +01:00
parent 298fdbfe36 fdf8abc174
commit 0370fca8b5
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/scanepg.cpp
View File

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

25
src/gui/movieplayer.cpp
View File

@@ -121,17 +121,24 @@ CMoviePlayerGui::CMoviePlayerGui()
CMoviePlayerGui::~CMoviePlayerGui() CMoviePlayerGui::~CMoviePlayerGui()
{ {
//playback->Close();
if (this == instance_mp) if (this == instance_mp)
stopPlayBack(); stopPlayBack();
delete moviebrowser; if(moviebrowser){
moviebrowser = NULL; delete moviebrowser;
delete filebrowser; moviebrowser = NULL;
filebrowser = NULL; }
delete bookmarkmanager; if(filebrowser){
bookmarkmanager = NULL; delete filebrowser;
delete playback; filebrowser = NULL;
playback = NULL; }
if(bookmarkmanager){
delete bookmarkmanager;
bookmarkmanager = NULL;
}
if(playback){
delete playback;
playback = NULL;
}
if (this == instance_mp) { if (this == instance_mp) {
delete instance_bg; delete instance_bg;
instance_bg = NULL; instance_bg = NULL;