Fix X to Xv switching

Returning from video playback would continue using X instead of Xv for the
live camera feed.

1 files changed, 7 insertions, 0 deletions

diff --git a/model.py b/model.py
index f40061e..e6c90c9 100644
--- a/model.py
+++ b/model.py
@@ -126,6 +126,13 @@ class Model:
 
         if state == constants.STATE_READY:
             self.gplay.stop()
+
+            # if we aren't using Xv (e.g. glive is playing as PIP in video
+            # mode), then stop the pipeline so that we switch back to Xv
+            # in the call that follows.
+            if not self.glive.is_using_xv():
+                self.glive.stop()
+
             self.glive.play()
 
         self.activity.set_state(state)