poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core/reloader: fix incorrect generation teardown on hard reload

Browse source
This commit is contained in:
outfoxxed 2024-05-31 00:26:34 -07:00
parent 6c9526761c
commit 84bb4098ad
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/core/rootwrapper.cpp
View file

@ -65,7 +65,7 @@ void RootWrapper::reloadGraph(bool hard) {
auto* obj = component.beginCreate(generation->engine->rootContext()); auto* obj = component.beginCreate(generation->engine->rootContext());
if (obj == nullptr) { if (obj == nullptr) {
QString error = "failed to create root component\n" + component.errorString(); const QString error = "failed to create root component\n" + component.errorString();
qWarning().noquote() << error; qWarning().noquote() << error;
delete generation; delete generation;
@ -78,7 +78,7 @@ void RootWrapper::reloadGraph(bool hard) {
auto* newRoot = qobject_cast<ShellRoot*>(obj); auto* newRoot = qobject_cast<ShellRoot*>(obj);
if (newRoot == nullptr) { if (newRoot == nullptr) {
QString error = "root component was not a Quickshell.ShellRoot"; const QString error = "root component was not a Quickshell.ShellRoot";
qWarning().noquote() << error; qWarning().noquote() << error;
delete obj; delete obj;
delete generation; delete generation;
@ -96,7 +96,11 @@ void RootWrapper::reloadGraph(bool hard) {
auto isReload = this->generation != nullptr; auto isReload = this->generation != nullptr;
generation->onReload(hard ? nullptr : this->generation); generation->onReload(hard ? nullptr : this->generation);
if (hard) delete this->generation;
if (hard && this->generation != nullptr) {
this->generation->destroy();
}
this->generation = generation; this->generation = generation;
qInfo() << "Configuration Loaded"; qInfo() << "Configuration Loaded";