mirror of
https://github.com/quickshell-mirror/quickshell.git
synced 2026-10-27 02:54:36 +00:00
core: fix shutdown sequence crashing
This commit is contained in:
3 files changed
+10
-4
No files matched your search
@@ -84,6 +84,14 @@ void EngineGeneration::destroy() {
|
||||
}
|
||||
}
|
||||
|
||||
void EngineGeneration::shutdown() {
|
||||
delete this->root;
|
||||
this->root = nullptr;
|
||||
delete this->engine;
|
||||
this->engine = nullptr;
|
||||
delete this;
|
||||
}
|
||||
|
||||
void EngineGeneration::onReload(EngineGeneration* old) {
|
||||
if (old != nullptr) {
|
||||
// if the old generation holds the window incubation controller as the
|
||||
|
||||
@@ -51,6 +51,7 @@ public:
|
||||
QuickshellGlobal* qsgInstance = nullptr;
|
||||
|
||||
void destroy();
|
||||
void shutdown();
|
||||
|
||||
signals:
|
||||
void filesChanged();
|
||||
|
||||
@@ -35,11 +35,8 @@ RootWrapper::RootWrapper(QString rootPath)
|
||||
RootWrapper::~RootWrapper() {
|
||||
// event loop may no longer be running so deleteLater is not an option
|
||||
if (this->generation != nullptr) {
|
||||
delete this->generation->root;
|
||||
this->generation->root = nullptr;
|
||||
this->generation->shutdown();
|
||||
}
|
||||
|
||||
delete this->generation;
|
||||
}
|
||||
|
||||
void RootWrapper::reloadGraph(bool hard) {
|
||||
|
||||
Reference in new issue
Block a user