From a72b5ee6633064fd56e47462f277464db941badc Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Tue, 10 Sep 2019 20:11:02 -0400
Subject: [PATCH] preview: fix too many calls to stopPreview
Change-Id: I2b42d3d4c5a341333e9b985c488dbd916da2326f
---
mainwindow.cpp | 1 -
settingswidget.cpp | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 055be89..aecebb5 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -304,7 +304,6 @@ void MainWindow::changeEvent(QEvent* e)
void MainWindow::closeEvent(QCloseEvent* event)
{
- LRCInstance::avModel().stopPreview();
QSettings settings("jami.net", "Jami");
if (LRCInstance::accountModel().getAccountList().size() &&
settings.value(SettingsKey::closeOrMinimized).toBool()) {
diff --git a/settingswidget.cpp b/settingswidget.cpp
index ec1b3eb..8656e2a 100644
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -464,10 +464,10 @@ void SettingsWidget::updateAccountInfoDisplayed()
}
// sip avatar set
- setAvatar(ui->currentSIPAccountAvatar, true);
+ setAvatar(ui->currentSIPAccountAvatar, false);
// jami avatar set
- setAvatar(ui->currentAccountAvatar, true);
+ setAvatar(ui->currentAccountAvatar, false);
ui->accountEnableCheckBox->setChecked(accInfo.enabled);
ui->accountSIPEnableCheckBox->setChecked(accInfo.enabled);
--
GitLab