Merge pull request #2580 from nextcloud/delay-settingsdialog-init

Delay initialization of SettingsDialog
This commit is contained in:
Kevin Ottens 2020-10-22 15:08:01 +02:00 committed by GitHub
commit b982a17998
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -59,7 +59,7 @@ const char propertyAccountC[] = "oc_account";
ownCloudGui::ownCloudGui(Application *parent)
: QObject(parent)
, _tray(nullptr)
, _settingsDialog(new SettingsDialog(this))
, _settingsDialog(nullptr)
, _logBrowser(nullptr)
#ifdef WITH_LIBCLOUDPROVIDERS
, _bus(QDBusConnection::sessionBus())

View file

@ -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);
}