Merge branch 'master' of github.com:collin80/SavvyCAN into WIP2

2016-08-08 15:37:41 -04:00
parent 4885b4b24b 8ab3042283
commit 6a8b20a48e
8 changed files with 98 additions and 42 deletions
@@ -394,10 +394,12 @@ void FramePlaybackWindow::btnLoadLive()

 void FramePlaybackWindow::btnBackOneClick()
 {
+    sendingBuffer.clear();
    playbackTimer->stop(); //pushing this button halts automatic playback
    playbackActive = false;

    updatePosition(false);
+    emit sendFrameBatch(&sendingBuffer);
 }

 void FramePlaybackWindow::btnPauseClick()
@@ -444,9 +446,11 @@ void FramePlaybackWindow::btnPlayClick()

 void FramePlaybackWindow::btnFwdOneClick()
 {
+    sendingBuffer.clear();
    playbackTimer->stop();
    playbackActive = false;
    updatePosition(true);
+    emit sendFrameBatch(&sendingBuffer);
 }

 void FramePlaybackWindow::changePlaybackSpeed(int newSpeed)