Merge pull request #7700 from aangerma/DSO-12584

Fixed playback Resuming on 3D viewer
IntelRealSense · Nov 3, 2020 · 2917be4 · 2917be4
2 parents 20d16c4 + 564b89b
commit 2917be4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/common/model-views.cpp b/common/model-views.cpp
@@ -2074,7 +2074,7 @@ namespace rs2
 
     std::shared_ptr<texture_buffer> stream_model::upload_frame(frame&& f)
     {
-        if (dev && dev->is_paused() && !dev->dev.is<playback>()) return nullptr;
+        if (dev && dev->is_paused()) return nullptr;
 
         last_frame = std::chrono::high_resolution_clock::now();
 
@@ -4014,7 +4014,7 @@ namespace rs2
                         if (s->streaming)
                             s->resume();
                     }
-
+                    viewer.paused = false;
                     p.resume();
                 }