github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-13 00:33:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Suppress warning when session cookie name isn't overridden

Browse source 
PR #18455.
This commit is contained in:
Vladimir Golovnev 2023-01-26 07:00:20 +03:00 • committed by GitHub
parent ca72360b6f
commit c58fb92365
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/app/application.cpp
View file

@ -815,7 +815,6 @@ try
}); });
disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog); disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog);
// we must not delete menu while it is used by DesktopIntegration
#ifndef Q_OS_MACOS #ifndef Q_OS_MACOS
const WindowState windowState = !m_startupProgressDialog ? WindowState::Hidden const WindowState windowState = !m_startupProgressDialog ? WindowState::Hidden
: (m_startupProgressDialog->windowState() & Qt::WindowMinimized) ? WindowState::Minimized : (m_startupProgressDialog->windowState() & Qt::WindowMinimized) ? WindowState::Minimized

7
src/webui/webapplication.cpp
View file

@ -156,8 +156,11 @@ WebApplication::WebApplication(IApplication *app, QObject *parent)
m_sessionCookieName = Preferences::instance()->getWebAPISessionCookieName(); m_sessionCookieName = Preferences::instance()->getWebAPISessionCookieName();
if (!isValidCookieName(m_sessionCookieName)) if (!isValidCookieName(m_sessionCookieName))
{ {
LogMsg(tr("Unacceptable session cookie name is specified: '%1'. Default one is used.") if (!m_sessionCookieName.isEmpty())
.arg(m_sessionCookieName), Log::WARNING); {
LogMsg(tr("Unacceptable session cookie name is specified: '%1'. Default one is used.")
.arg(m_sessionCookieName), Log::WARNING);
}
m_sessionCookieName = DEFAULT_SESSION_COOKIE_NAME; m_sessionCookieName = DEFAULT_SESSION_COOKIE_NAME;
} }
} }