htsp server: another fix for single epg event logic in getEvents

tvheadend · May 16, 2016 · f027e3c · f027e3c
1 parent 0a2958a
commit f027e3c
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/htsp_server.c b/src/htsp_server.c
@@ -1563,13 +1563,11 @@ htsp_method_getEvents(htsp_connection_t *htsp, htsmsg_t *in)
   /* Use event as starting point */
   if (e || ch) {
 
-    if (e && !ch) ch = e->channel;
+    if (!e) e = ch->ch_epg_now ?: ch->ch_epg_next;
 
-    if (!htsp_user_access_channel(htsp, ch))
+    if (e && !htsp_user_access_channel(htsp, e->channel))
       return htsp_error(htsp, N_("User does not have access"));
 
-    if (!e) e = ch->ch_epg_now ?: ch->ch_epg_next;
-
     /* Output */
     events = htsmsg_create_list();
     while (e) {