Browse Source

Suppress warning when session cookie name isn't overridden

PR #18455.
adaptive-webui-19844
Vladimir Golovnev 2 years ago committed by GitHub
parent
commit
c58fb92365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/app/application.cpp
  2. 3
      src/webui/webapplication.cpp

1
src/app/application.cpp

@ -815,7 +815,6 @@ try @@ -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

3
src/webui/webapplication.cpp

@ -155,9 +155,12 @@ WebApplication::WebApplication(IApplication *app, QObject *parent) @@ -155,9 +155,12 @@ WebApplication::WebApplication(IApplication *app, QObject *parent)
m_sessionCookieName = Preferences::instance()->getWebAPISessionCookieName();
if (!isValidCookieName(m_sessionCookieName))
{
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;
}
}

Loading…
Cancel
Save