Guard against null QProxyStyle::baseStyle()

See #1686 #1707
11 years ago · 939ebeb2c9
parent ffcf137967
commit 939ebeb2c9
1 changed files with 4 additions and 1 deletions
--- a/src/lib/app/mainapplication.cpp
+++ b/src/lib/app/mainapplication.cpp
@ -477,7 +477,10 @@ void MainApplication::setProxyStyle(ProxyStyle* style)

 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