Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 19:12:11 +01:00
Code Releases Activity

Guard against null QProxyStyle::baseStyle()

Browse Source 
See #1686 #1707
This commit is contained in:
David Rosca 2015-10-01 20:25:22 +02:00
parent ffcf137967
commit 939ebeb2c9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/app/mainapplication.cpp
View File

@ -477,7 +477,10 @@ void MainApplication::setProxyStyle(ProxyStyle* style)
QString MainApplication::styleName() const QString MainApplication::styleName() const
{ {
return m_proxyStyle ? m_proxyStyle->baseStyle()->objectName() : style()->objectName(); if (m_proxyStyle && m_proxyStyle->baseStyle())
return m_proxyStyle->baseStyle()->objectName();
return style()->objectName();
} }
QString MainApplication::currentLanguageFile() const QString MainApplication::currentLanguageFile() const