Merge remote-tracking branch 'tuxbox/master'

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

@@ -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;