Bismuth-Forge/bismuth
1
1
Fork 0
mirror of https://github.com/Bismuth-Forge/bismuth.git synced 2024-10-05 12:37:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(kdecoration): prevent crash when changing color scheme

Browse Source 
Capture this by value, check painter for nullness.
This commit is contained in:
Mikhail Zolotukhin 2022-04-01 21:18:33 +03:00 committed by Genda
parent fc925f49b3
commit 3e872eed8d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kdecoration/decoration.cpp
View File

@ -31,6 +31,10 @@ void Decoration::init()
void Decoration::paint(QPainter *painter, const QRect &repaintRegion)
{
if (!painter) {
return;
}
paintBorders(*painter);
}
@ -78,12 +82,12 @@ void Decoration::connectEvents()
auto settingsPtr = settings().data();
// No idea why regular connection does not work
connect(clientPtr, &KDecoration2::DecoratedClient::activeChanged, this, [&](bool value) {
connect(clientPtr, &KDecoration2::DecoratedClient::activeChanged, this, [this](bool value) {
this->update();
});
connect(settingsPtr, &KDecoration2::DecorationSettings::borderSizeChanged, this, &Decoration::setBorderSizes);
connect(m_kdeglobalsWatcher.data(), &KConfigWatcher::configChanged, [&](const KConfigGroup &group, const QByteArrayList &names) {
connect(m_kdeglobalsWatcher.data(), &KConfigWatcher::configChanged, [this](const KConfigGroup &group, const QByteArrayList &names) {
if (group.name() == QStringLiteral("General")) {
if (names.contains(QByteArrayLiteral("ColorScheme")) || names.contains(QByteArrayLiteral("AccentColor"))) {
updateColors();