Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/core/qmlglobal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,10 @@ void QuickshellTracked::updateScreens() {
next:;
}

// Retain removed screens rather than deleting them, since users might hold on to
// a bare `QObject*` (via a `QVariant`) pointing at the old screen.
for (auto* oldScreen: this->screens) {
oldScreen->deleteLater();
this->mDeadScreens.push_back(oldScreen);
}

this->screens = newScreens;
Expand Down
5 changes: 5 additions & 0 deletions src/core/qmlglobal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ private slots:

signals:
void screensChanged();

private:
// Screens removed from the system are stored here instead of being
// deleted, since users might hold on to bare `QObject*`s pointing at them.
QVector<QuickshellScreenInfo*> mDeadScreens;
};

class QuickshellGlobal: public QObject {
Expand Down
Loading