flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 07:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed typo not setting the new, but still the old style

Browse Source 
* Crashes if the style is changed when the UI is fully initialized
* Still needs to be fixed
* Crashes are random
This commit is contained in:
Klaus Basan
2019-04-11 01:20:15 +02:00
committed by Mat Sutcliffe
parent 24880c39fc
commit 5626b28ddc
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/guiapplication.cpp
View File

@@ -20,6 +20,7 @@
#include "blackcore/webdataservices.h"
#include "blackcore/setupreader.h"
#include "blackmisc/slot.h"
#include "blackmisc/stringutils.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/datacache.h"
#include "blackmisc/logcategory.h"
@@ -1074,9 +1075,10 @@ namespace BlackGui
// changing widget style is slow, so I try to prevent setting it when nothing changed
const QString widgetStyle = m_guiSettings.get().getWidgetStyle();
const QString currentWidgetStyle(this->getWidgetStyle());
if (!(currentWidgetStyle.length() == widgetStyle.length() && currentWidgetStyle.startsWith(widgetStyle, Qt::CaseInsensitive)))
Q_ASSERT_X(CThreadUtils::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Wrong thread");
if (!stringCompare(widgetStyle, currentWidgetStyle, Qt::CaseInsensitive))
{
const auto availableStyles = QStyleFactory::keys();
const QStringList availableStyles = QStyleFactory::keys();
if (availableStyles.contains(widgetStyle))
{
// changing style freezes the application, so it must not be done in flight mode
@@ -1086,17 +1088,19 @@ namespace BlackGui
}
else
{
QStyle *style = QApplication::setStyle(currentWidgetStyle);
// QStyle *style = QApplication::setStyle(widgetStyle);
QStyle *style = QStyleFactory::create(widgetStyle);
QApplication::setStyle(style); // subject of crash
if (style)
{
CLogMessage(this).info(u"Changed style to '%1', req.: '%2'") << style->objectName() << currentWidgetStyle;
CLogMessage(this).info(u"Changed style to '%1', req.: '%2'") << style->objectName() << widgetStyle;
}
else
{
CLogMessage(this).error(u"Unable to set requested style '%1'") << currentWidgetStyle;
CLogMessage(this).error(u"Unable to set requested style '%1'") << widgetStyle;
}
}
}
} // valid style
}
}