From c58fb923656cc7c9a4c4aa7ac6ea0109b191d316 Mon Sep 17 00:00:00 2001 From: Vladimir Golovnev Date: Thu, 26 Jan 2023 07:00:20 +0300 Subject: [PATCH] Suppress warning when session cookie name isn't overridden PR #18455. --- src/app/application.cpp | 1 - src/webui/webapplication.cpp | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/application.cpp b/src/app/application.cpp index 72a07f99d..98a3c8ba5 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -815,7 +815,6 @@ try }); disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog); - // we must not delete menu while it is used by DesktopIntegration #ifndef Q_OS_MACOS const WindowState windowState = !m_startupProgressDialog ? WindowState::Hidden : (m_startupProgressDialog->windowState() & Qt::WindowMinimized) ? WindowState::Minimized diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index c3f2de6fb..f03475e26 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -156,8 +156,11 @@ WebApplication::WebApplication(IApplication *app, QObject *parent) m_sessionCookieName = Preferences::instance()->getWebAPISessionCookieName(); if (!isValidCookieName(m_sessionCookieName)) { - LogMsg(tr("Unacceptable session cookie name is specified: '%1'. Default one is used.") - .arg(m_sessionCookieName), Log::WARNING); + if (!m_sessionCookieName.isEmpty()) + { + LogMsg(tr("Unacceptable session cookie name is specified: '%1'. Default one is used.") + .arg(m_sessionCookieName), Log::WARNING); + } m_sessionCookieName = DEFAULT_SESSION_COOKIE_NAME; } }