diff options
| author | Christian Wieninger <cwieninger@gmx.de> | 2012-04-06 20:27:04 +0200 |
|---|---|---|
| committer | Christian Wieninger <cwieninger@gmx.de> | 2012-04-06 20:27:04 +0200 |
| commit | 3bd2658c85f00269583259d5912c88f031b9599f (patch) | |
| tree | 6f95f40fbaf30b383a16f566d84a0ade7b448cec /menu_myedittimer.c | |
| parent | 65f1e5030f076c530a5a6a37ead43cf7d9d86325 (diff) | |
| download | vdr-plugin-epgsearch-3bd2658c85f00269583259d5912c88f031b9599f.tar.gz vdr-plugin-epgsearch-3bd2658c85f00269583259d5912c88f031b9599f.tar.bz2 | |
bugtracker #929, bunch of warning fixes, thanks to Joe_D for providing this patch
Diffstat (limited to 'menu_myedittimer.c')
| -rw-r--r-- | menu_myedittimer.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/menu_myedittimer.c b/menu_myedittimer.c index d3b1e86..5f4391f 100644 --- a/menu_myedittimer.c +++ b/menu_myedittimer.c @@ -333,7 +333,6 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key) if (timer && timer->Aux()) fullaux = timer->Aux(); - int bstart = 0, bstop = 0; // calculate margins if (event && IsSingleEvent()) { time_t startTime = 0, stopTime = 0;; @@ -343,8 +342,9 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key) length += SECSINDAY; startTime = cTimer::SetTime(day, begin); stopTime = startTime + length; - bstart = event->StartTime() - startTime; - bstop = stopTime - event->EndTime(); + // calculate margins + int bstart = event->StartTime() - startTime; + int bstop = stopTime - event->EndTime(); char* epgsearchaux = GetAuxValue(timer, "epgsearch"); if (epgsearchaux) @@ -372,11 +372,14 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key) #endif char* tmpFile = strdup(file); - tmpFile = strreplace(tmpFile, ':', '|'); + strreplace(tmpFile, ':', '|'); char* tmpDir = strdup(directory); - tmpDir = strreplace(tmpDir, ':', '|'); + strreplace(tmpDir, ':', '|'); if (strlen(tmpFile) == 0) + { + free(tmpFile); tmpFile = strdup(CHANNELNAME(ch)); + } if (timer) { @@ -406,7 +409,10 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key) gl_timerStatusMonitor->SetConflictCheckAdvised(); Timers.SetModified(); addIfConfirmed = false; - } + } else { + free(tmpFile); + free(tmpDir); + } } return osBack; case kRed: |