fixed crash when start recording with extrecmenu or remotetimers

This commit is contained in:
louis 2015-01-18 12:03:06 +01:00
parent c05b8413f0
commit 5801b4bab2
8 changed files with 22 additions and 21 deletions

View File

@ -151,3 +151,4 @@ Version 0.1.2
Version 0.1.3
- added {epgname} token for recordings in currentview and detailedview.
- fixed crash when start recording with extrecmenu or remotetimers

View File

@ -2,6 +2,7 @@
#include "libcore/timers.h"
cSDDisplayChannel::cSDDisplayChannel(cTemplate *channelTemplate, bool WithInfo) {
channelView = NULL;
if (firstDisplay) {
firstDisplay = false;
doOutput = false;
@ -30,8 +31,7 @@ cSDDisplayChannel::cSDDisplayChannel(cTemplate *channelTemplate, bool WithInfo)
}
cSDDisplayChannel::~cSDDisplayChannel() {
if (!doOutput)
return;
if (channelView)
delete channelView;
}

View File

@ -3,6 +3,7 @@
cSDDisplayMenu::cSDDisplayMenu(cTemplate *menuTemplate) {
textAreaFont = NULL;
rootView = NULL;
doOutput = true;
state = vsInit;
pluginMenu = -1;
@ -21,8 +22,7 @@ cSDDisplayMenu::cSDDisplayMenu(cTemplate *menuTemplate) {
}
cSDDisplayMenu::~cSDDisplayMenu() {
if (!doOutput)
return;
if (rootView)
delete rootView;
if (textAreaFont)
delete textAreaFont;

View File

@ -1,6 +1,7 @@
#include "displaymessage.h"
cSDDisplayMessage::cSDDisplayMessage(cTemplate *messageTemplate) {
messageView = NULL;
doOutput = true;
initial = true;
if (!messageTemplate) {
@ -17,8 +18,7 @@ cSDDisplayMessage::cSDDisplayMessage(cTemplate *messageTemplate) {
}
cSDDisplayMessage::~cSDDisplayMessage() {
if (!doOutput)
return;
if (messageView)
delete messageView;
}

View File

@ -5,6 +5,7 @@ cSDDisplayReplay::cSDDisplayReplay(cTemplate *replayTemplate, bool ModeOnly) {
doOutput = true;
initial = true;
modeOnly = ModeOnly;
replayView = NULL;
if (!replayTemplate) {
doOutput = false;
esyslog("skindesigner: displayReplay no valid template - aborting");
@ -19,8 +20,7 @@ cSDDisplayReplay::cSDDisplayReplay(cTemplate *replayTemplate, bool ModeOnly) {
}
cSDDisplayReplay::~cSDDisplayReplay() {
if (!doOutput)
return;
if (replayView)
delete replayView;
}

View File

@ -4,6 +4,7 @@
cSDDisplayTracks::cSDDisplayTracks(cTemplate *audiotracksTemplate, const char *Title, int NumTracks, const char * const *Tracks) {
initial = true;
numTracks = NumTracks;
tracksView = NULL;
doOutput = true;
currentTrack = 0;
menuTitle = Title;
@ -28,8 +29,7 @@ cSDDisplayTracks::cSDDisplayTracks(cTemplate *audiotracksTemplate, const char *T
}
cSDDisplayTracks::~cSDDisplayTracks() {
if (!doOutput)
return;
if (tracksView)
delete tracksView;
}

View File

@ -4,6 +4,7 @@
#include "libcore/helpers.h"
cSDDisplayVolume::cSDDisplayVolume(cTemplate *volumeTemplate) {
volumeView = NULL;
doOutput = true;
initial = true;
if (!volumeTemplate) {
@ -20,8 +21,7 @@ cSDDisplayVolume::cSDDisplayVolume(cTemplate *volumeTemplate) {
}
cSDDisplayVolume::~cSDDisplayVolume() {
if (!doOutput)
return;
if (volumeView)
delete volumeView;
}

View File

@ -44,7 +44,7 @@ cPixmapContainer::~cPixmapContainer(void) {
bool cPixmapContainer::CreateOsd(int Left, int Top, int Width, int Height) {
if (osd) {
return true;
return false;
}
cOsd *newOsd = cOsdProvider::NewOsd(Left, Top);
if (newOsd) {