1:
2:
3:
4:
5:
6:
7:
8:
9:
10:
11:
12:
13:
14:
15:
16:
17:
18:
19:
20:
21:
22:
23:
24:
25:
26:
27:
28:
29:
30:
31:
32:
33:
34:
35:
36:
37:
38:
39:
40:
41:
42:
43:
44:
45:
46:
47:
48:
49:
50:
51:
52:
53:
54:
55:
56:
57:
58:
59:
60:
61:
62:
63:
64:
65:
66:
67:
68:
69:
70:
71:
72:
73:
74:
75:
76:
77:
78:
79:
80:
81:
82:
83:
84:

--- tvonscreen-0.7.0/magazine.c
+++ tvonscreen-0.7.0/magazine.c
@@ -642,6 +642,9 @@
 const cEventInfo *magazine::getNext(const cSchedule *s,const cEventInfo *e)
 #endif
 {
+       if (e == NULL)
+               return NULL;
+
 #if VDRVERSNUM >= 10300
        const cEvent *pe = NULL;
        time_t ref = e->StartTime();
@@ -686,6 +689,9 @@
 const cEventInfo *magazine::getPrev(const cSchedule *s,const cEventInfo *e)
 #endif
 {
+       if (e == NULL)
+               return NULL;
+
 #if VDRVERSNUM >= 10300
        const cEvent *pe = NULL;
        time_t ref = e->StartTime();
@@ -1621,18 +1627,21 @@
                                {
                                        case kOk:
                                                {
-                                                       delete osd;
-                                                       osd=NULL;
 #if VDRVERSNUM >= 10300
                                                        cEvent **ev=ev4ch(EDIT_curChannel);
 #else
                                                        cEventInfo **ev=ev4ch(EDIT_curChannel);
 #endif
-                                                       me=new tvOcMenuEvent(ev[EDIT_curEVI]);
-                                                       me->Display();
-                                                       curmode=SHOW;
-                                                       EDIT_curEvent=0;
-                                                       return osContinue;
+                                                       if (ev[EDIT_curEVI] != NULL)
+                                                       {
+                                                               delete osd;
+                                                               osd=NULL;
+                                                               me=new tvOcMenuEvent(ev[EDIT_curEVI]);
+                                                               me->Display();
+                                                               curmode=SHOW;
+                                                               EDIT_curEvent=0;
+                                                               return osContinue;
+                                                       }
                                                }
                                                break;
                        case kBack:
@@ -1788,21 +1797,24 @@
                                                break;                  */
                                case kRecord:
                                        {
-                                               delete osd;
-                                               osd=NULL;
 #if VDRVERSNUM >= 10300
                                                cEvent **ev=ev4ch(EDIT_curChannel);
 #else
                                                cEventInfo **ev=ev4ch(EDIT_curChannel);
 #endif
-                                               cTimer *timer = new cTimer(ev[EDIT_curEVI]);
-                                               cTimer *t = Timers.GetTimer(timer);
-                                               if (t)
+                                               if (ev[EDIT_curEVI] != NULL)
                                                {
-                                                       delete timer;
-                                                       timer = t;
+                                                       delete osd;
+                                                       osd=NULL;
+                                                       cTimer *timer = new cTimer(ev[EDIT_curEVI]);
+                                                       cTimer *t = Timers.GetTimer(timer);
+                                                       if (t)
+                                                       {
+                                                               delete timer;
+                                                               timer = t;
+                                                       }
+                                                       met=new cMenuEditTimer(timer, !t);
                                                }
-                                               met=new cMenuEditTimer(timer, !t);
                                        }
                                        break;
                                        default: