frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 17:58:31 +02:00
Code Issues Releases Wiki Activity

fixed crash when start recording with extrecmenu or remotetimers

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

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

4
displaychannel.c
View File

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

4
displaymenu.c
View File

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

4
displaymessage.c
View File

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

4
displayreplay.c
View File

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

4
displaytracks.c
View File

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

4
displayvolume.c
View File

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

2
libcore/pixmapcontainer.c
View File

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