Merge branch 'development' into LTS_development

2017-10-09 16:05:04 +02:00 · 2017-10-09 16:05:04 +02:00 · acecdff31c
commit acecdff31c
parent 78b5c28116 90c017bfcd
1 changed files with 4 additions and 0 deletions
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@ -612,6 +612,10 @@ namespace Mist{
      pageNum = pageNumForKey(trackId, keyNum);
    }
    
+    if (!keepGoing()){
+      return;
+    }
+
    if (keyNum){
      nxtKeyNum[trackId] = keyNum-1;
    }else{