commit e0c7e33dc843cf5ee9f671e74f40f6272774ee0f
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Thu Jul 30 11:11:33 2015 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Thu Jul 30 12:04:08 2015 -0400
tree 9bcb3e2c61e62b5af3066a71c628ae67dbc0bdc0
parent 0327c0e0b86a90f16946815ddcc2530ef686b276

video settings: prevent stopping preview

Prevent the video setting panel to start/stop the preview if it's already
running. If their is an ongoing call we do not stop the preview when leaving
video settings panel.

Issue: #78359
Change-Id: I4bcf0cee460880e6491b57535348ef3ef46b474b

src/VideoPrefsVC.mm

diff --git a/src/VideoPrefsVC.mm b/src/VideoPrefsVC.mm
index ef01dce..791fac0 100644
--- a/src/VideoPrefsVC.mm
+++ b/src/VideoPrefsVC.mm
@@ -48,6 +48,8 @@
 @property (assign) IBOutlet NSPopUpButton *sizesList;
 @property (assign) IBOutlet NSPopUpButton *ratesList;
 
+@property BOOL shouldHandlePreview;
+
 @end
 
 @implementation VideoPrefsVC
@@ -97,6 +99,8 @@
 
     }
 
+    // check if preview has to be started/stopped by this controller
+    self.shouldHandlePreview = !Video::PreviewManager::instance()->isPreviewing();
 
     [previewView setWantsLayer:YES];
     [previewView setLayer:[CALayer layer]];
@@ -191,12 +195,16 @@
 
 - (void) viewWillAppear
 {
-    Video::PreviewManager::instance()->startPreview();
+    if (self.shouldHandlePreview) {
+        Video::PreviewManager::instance()->startPreview();
+    }
 }
 
 - (void)viewWillDisappear
 {
-    Video::PreviewManager::instance()->stopPreview();
+    if (self.shouldHandlePreview) {
+        Video::PreviewManager::instance()->stopPreview();
+    }
 }
 
 #pragma mark - NSMenuDelegate methods