Skip to content

fix: disconnect the settings handlers when Forge is disabled #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattchristenson wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: disconnect the settings handlers when Forge is disabled #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f857295
fix: disconnect the settings handlers when Forge is disabled
Sep 30, 2026
47ba5b7
fix: release a closing window's handlers too when Forge is disabled
Sep 30, 2026
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
12 changes: 10 additions & 2 deletions lib/extension/indicator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,20 @@ export class FeatureIndicator extends SystemIndicator {

this._indicator.visible = tilingModeEnabled && quickSettingsEnabled;

this.extension.settings.connect("changed", (_, name) => {
this._settings = this.extension.settings;
this._settingsChangedId = this._settings.connect("changed", (_, name) => {
switch (name) {
case "tiling-mode-enabled":
case "quick-settings-enabled":
this._indicator.visible = this.extension.settings.get_boolean(name);
this._indicator.visible = this._settings.get_boolean(name);
}
});
}

destroy() {
// the handler would outlive the indicator, and the extension's settings (#469's log)
if (this._settingsChangedId) this._settings.disconnect(this._settingsChangedId);
this._settingsChangedId = 0;
super.destroy();
}
}
57 changes: 38 additions & 19 deletions lib/extension/window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,10 @@ export class WindowManager extends GObject.Object {

let settings = this.ext.settings;

settings.connect("changed", (_, settingName) => {
// (kept to disconnect in _removeSignals: the extension drops its settings on disable, and
// a handler left connected failed on every later change)
this._settings = settings;
this._settingsChangedId = settings.connect("changed", (_, settingName) => {
switch (settingName) {
case "window-overrides-reload-trigger":
// Reload window overrides when triggered by preferences
Expand Down Expand Up @@ -1042,6 +1045,12 @@ export class WindowManager extends GObject.Object {
_removeSignals() {
if (!this._signalsBound) return;

if (this._settingsChangedId) {
this._settings.disconnect(this._settingsChangedId);
this._settingsChangedId = 0;
this._settings = null;
}

if (this._displaySignals) {
for (const displaySignal of this._displaySignals) {
global.display.disconnect(displaySignal);
Expand Down Expand Up @@ -1082,6 +1091,10 @@ export class WindowManager extends GObject.Object {
}

let allWindows = this.windowsAllWorkspaces;
// A window that is closing has left the window list, but its actor keeps its handlers and
// borders until the close animation ends: release those too
const windowActors = new Set(this._windowActors);
this._windowActors?.clear();

if (allWindows) {
for (let metaWindow of allWindows) {
Expand All @@ -1094,29 +1107,33 @@ export class WindowManager extends GObject.Object {
}

let windowActor = metaWindow.get_compositor_private();
if (windowActor && windowActor.actorSignals) {
for (const actorSignal of windowActor.actorSignals) {
windowActor.disconnect(actorSignal);
}
windowActor.actorSignals.length = 0;
windowActor.actorSignals = undefined;
if (windowActor) windowActors.add(windowActor);
}
}

for (const windowActor of windowActors) {
if (windowActor.actorSignals) {
for (const actorSignal of windowActor.actorSignals) {
windowActor.disconnect(actorSignal);
}
windowActor.actorSignals.length = 0;
windowActor.actorSignals = undefined;
}

if (windowActor && windowActor.border) {
windowActor.border.hide();
if (global.window_group) {
global.window_group.remove_child(windowActor.border);
}
windowActor.border = undefined;
if (windowActor.border) {
windowActor.border.hide();
if (global.window_group) {
global.window_group.remove_child(windowActor.border);
}
windowActor.border = undefined;
}

if (windowActor && windowActor.splitBorder) {
windowActor.splitBorder.hide();
if (global.window_group) {
global.window_group.remove_child(windowActor.splitBorder);
}
windowActor.splitBorder = undefined;
if (windowActor.splitBorder) {
windowActor.splitBorder.hide();
if (global.window_group) {
global.window_group.remove_child(windowActor.splitBorder);
}
windowActor.splitBorder = undefined;
}
}

Expand Down Expand Up @@ -1525,6 +1542,7 @@ export class WindowManager extends GObject.Object {
if (!windowActor.actorSignals) {
let actorSignals = [windowActor.connect("destroy", this.windowDestroy.bind(this))];
windowActor.actorSignals = actorSignals;
(this._windowActors ??= new Set()).add(windowActor);
}

if (!windowActor.border) {
Expand Down Expand Up @@ -1671,6 +1689,7 @@ export class WindowManager extends GObject.Object {
}

windowDestroy(actor) {
this._windowActors?.delete(actor);
// Release any resources on the window
let border = actor.border;
if (border) {
Expand Down