From fb5fc5c5f1a06885d10f4814be80c55456b6cbc5 Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Thu, 24 Sep 2015 14:32:49 -0400
Subject: [PATCH] configuration: fix video display only on video tab

Introcuded by changes 2774

Issue: #80643
Change-Id: I6519ec473a5c290c93b9b03aa90c9024bd2afae1
---
 configurationwidget.cpp | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/configurationwidget.cpp b/configurationwidget.cpp
index 456b055..23dc0ac 100644
--- a/configurationwidget.cpp
+++ b/configurationwidget.cpp
@@ -73,11 +73,32 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) :
                 CategorizedHistoryModel::instance()->historyLimit());
     ui->closeOrMinCheckBox->setChecked(settings_.value(
                                            SettingsKey::closeOrMinimized).toBool());
+    connect(ui->tabWidget, QTabWidget::currentChanged, [](int index) {
+        if (index == 1
+                && CallModel::instance()->getActiveCalls().size() == 0) {
+            Video::PreviewManager::instance()->startPreview();
+        } else {
+            if (CallModel::instance()->getActiveCalls().size() == 0
+                    && Video::PreviewManager::instance()->isPreviewing()) {
+                Video::PreviewManager::instance()->stopPreview();
+            }
+        }
+    });
+}
+
+void
+ConfigurationWidget::showEvent(QShowEvent *event) {
+    QWidget::showEvent(event);
+    if (ui->tabWidget->currentIndex() == 1
+            && CallModel::instance()->getActiveCalls().size() == 0) {
+        Video::PreviewManager::instance()->startPreview();
+    }
 }
 
-void ConfigurationWidget::atExit() {
-    if (CallModel::instance()->getActiveCalls().size() == 0 ) {
-        ui->videoView->hide();
+void
+ConfigurationWidget::atExit() {
+    if (CallModel::instance()->getActiveCalls().size() == 0
+            && Video::PreviewManager::instance()->isPreviewing()) {
         Video::PreviewManager::instance()->stopPreview();
     }
     accountModel_->save();
@@ -190,16 +211,6 @@ ConfigurationWidget::on_startupBox_toggled(bool checked)
         Utils::DeleteStartupLink();
 }
 
-void
-ConfigurationWidget::showEvent(QShowEvent* event)
-{
-    QWidget::showEvent(event);
-    if (CallModel::instance()->getActiveCalls().size() == 0 ) {
-        ui->videoView->show();
-        Video::PreviewManager::instance()->startPreview();
-    }
-}
-
 void
 ConfigurationWidget::on_clearHistoryButton_clicked()
 {
-- 
GitLab