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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
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
parent 37a8e1c9a4 abe232fc6c
commit 4635eb375c
13 changed files with 193 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/movieplayer.cpp
View File

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