Skip to content
Snippets Groups Projects
Commit f38b0b52 authored by Albert  Babí Oller's avatar Albert Babí Oller Committed by Andreas Traczyk
Browse files

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
parent c4e6af36
No related branches found
No related tags found
No related merge requests found
...@@ -141,7 +141,10 @@ Window { ...@@ -141,7 +141,10 @@ Window {
} }
function toggleSettingsView() { function toggleSettingsView() {
if (!inSettingsView) {
inSettingsView = !inSettingsView
if (inSettingsView) {
if (sidePanelOnly) if (sidePanelOnly)
sidePanelViewStack.push(leftPanelSettingsView, StackView.Immediate) sidePanelViewStack.push(leftPanelSettingsView, StackView.Immediate)
else { else {
...@@ -164,7 +167,6 @@ Window { ...@@ -164,7 +167,6 @@ Window {
mainViewWindowSidePanel.deselectConversationSmartList() mainViewWindowSidePanel.deselectConversationSmartList()
} }
inSettingsView = !inSettingsView
} }
title: "Jami" title: "Jami"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment