From: Michael Schuster <michael@schuster.ms>
Date: Thu, 22 Oct 2020 02:14:09 +0000 (+0200)
Subject: Fix crash in SettingsDialog with delayed initialization
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~96^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7699004a11f896962dc7c6ba0b0920fad3dc902b;p=nextcloud-desktop.git

Fix crash in SettingsDialog with delayed initialization

setWindowFlags triggered changeEvent, thus causing a crash in customizeStyle.

This fix should be kept even if we decide against delayed init in the future.

Signed-off-by: Michael Schuster <michael@schuster.ms>
---

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 20b145a3c..1722ae9d9 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -62,7 +62,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
 {
     ConfigFile cfg;
 
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     _ui->setupUi(this);
     _toolBar = new QToolBar;
     _toolBar->setIconSize(QSize(32, 32));
@@ -130,6 +129,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
 
     customizeStyle();
 
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     cfg.restoreGeometry(this);
 }