From f38b0b527fdba866557c784534618a4084038df0 Mon Sep 17 00:00:00 2001
From: ababi <albert.babi@savoirfairelinux.com>
Date: Fri, 18 Sep 2020 12:23:20 +0200
Subject: [PATCH] settings: avoid race condition
fix inSettingsView flag toggle avoids infinite loops when coming back from settings
menu with an incoming call
Gitlab: #89
Change-Id: I54e0bdd4b437a9aee4f0575010e889bf891c287c
---
src/mainview/MainView.qml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 0da2f745e..cf697f2c9 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -141,7 +141,10 @@ Window {
}
function toggleSettingsView() {
- if (!inSettingsView) {
+
+ inSettingsView = !inSettingsView
+
+ if (inSettingsView) {
if (sidePanelOnly)
sidePanelViewStack.push(leftPanelSettingsView, StackView.Immediate)
else {
@@ -164,7 +167,6 @@ Window {
mainViewWindowSidePanel.deselectConversationSmartList()
}
- inSettingsView = !inSettingsView
}
title: "Jami"
--
GitLab