From e6f61f5643fbf175a139afd7999d37269a5517e5 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Thu, 11 Jun 2020 11:13:25 +0200
Subject: [PATCH] Do not crash if page load fails during Output::prepareNext

---
 src/output/output.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/output/output.cpp b/src/output/output.cpp
index 6af30538..c5f03007 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -1428,7 +1428,10 @@ namespace Mist{
     if (M.getPageNumberForTime(nxt.tid, nxt.time) != currentPage[nxt.tid]){
       loadPageForKey(nxt.tid, M.getPageNumberForTime(nxt.tid, nxt.time));
       nxt.offset = 0;
-      nxt.time = getDTSCTime(curPage[nxt.tid].mapped, 0);
+      //Only read the next time if the page load succeeded and there is a packet to read from
+      if (curPage[nxt.tid].mapped && curPage[nxt.tid].mapped[0] == 'D'){
+        nxt.time = getDTSCTime(curPage[nxt.tid].mapped, 0);
+      }
       buffer.erase(buffer.begin());
       buffer.insert(nxt);
       return false;