From 5b72407746fbff4d569c417d6fe312b980b94a3e Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Sat, 27 Jan 2018 23:10:03 -0500 Subject: [PATCH] Deconflict snapshot warning with http deprecation warning --- src/gui/MainWindow.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 302a81eb5..def6e6575 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -420,8 +420,8 @@ MainWindow::MainWindow() } #ifdef WITH_XC_HTTP if (config()->get("Http/Enabled", false).toBool() && config()->get("Http/DeprecationNoticeShown", 0).toInt() < 3) { - // show message after tab widget dismissed all messages - connect(m_ui->tabWidget, SIGNAL(messageDismissGlobal()), this, SLOT(showKeePassHTTPDeprecationNotice())); + // show message after global widget dismissed all messages + connect(m_ui->globalMessageWidget, SIGNAL(hideAnimationFinished()), this, SLOT(showKeePassHTTPDeprecationNotice())); } #endif @@ -430,6 +430,9 @@ MainWindow::MainWindow() "There is a high risk of corruption, maintain a backup of your databases.\n" "This version is not meant for production use."), MessageWidget::Warning, -1); +#else + // Show the HTTP deprecation message if enabled above + emit m_ui->globalMessageWidget->hideAnimationFinished(); #endif } @@ -448,7 +451,7 @@ void MainWindow::showKeePassHTTPDeprecationNotice() MessageWidget::Warning, true, -1); config()->set("Http/DeprecationNoticeShown", warningNum + 1); - disconnect(m_ui->tabWidget, SIGNAL(messageDismissGlobal()), this, SLOT(showKeePassHTTPDeprecationNotice())); + disconnect(m_ui->globalMessageWidget, SIGNAL(hideAnimationFinished()), this, SLOT(showKeePassHTTPDeprecationNotice())); } void MainWindow::appExit()