Properly disconnect from local state signals to avoid errors during applet reload

Author: anaximeno

files/usr/share/cinnamon/applets/[email protected]/appGroup.js

@@ -86,7 +86,7 @@ var AppGroup = class AppGroup {
             pressed: true
         });
 
-        this.groupState.connect({
+        this.groupStateConnectionId = this.groupState.connect({
             isFavoriteApp: () => this.handleFavorite(true),
             getActor: () => this.actor,
             launchNewInstance: (...args) => this.launchNewInstance(...args),
@@ -1196,6 +1196,9 @@ var AppGroup = class AppGroup {
     }
 
     destroy(skipRefCleanup) {
+        if (this.groupStateConnectionId) {
+            this.groupState.disconnect(this.groupStateConnectionId);
+        }
         this.signals.disconnectAllSignals();
         this.groupState.set({willUnmount: true});
 

files/usr/share/cinnamon/applets/[email protected]/applet.js

@@ -208,7 +208,7 @@ class GroupedWindowListApplet extends Applet.Applet {
         // applet to avoid passing down the parent class down the constructor chain and creating circular references.
         // In addition to manual event emitting, store.js can emit updates on property changes when set through
         // store.set. Any keys emitted through store.trigger that are not declared here first will throw an error.
-        this.state.connect({
+        this.stateConnectionId = this.state.connect({
             setSettingsValue: (k, v) => this.settings.setValue(k, v),
             getPanel: () => (this.panel ? this.panel : null),
             getPanelHeight: () => this._panelHeight,
@@ -428,6 +428,9 @@ class GroupedWindowListApplet extends Applet.Applet {
                 workspace.destroy();
             }
         });
+        if (this.stateConnectionId) {
+            this.state.disconnect(this.stateConnectionId);
+        }
         this.settings.finalize();
         unref(this, RESERVE_KEYS);
         MessageTray.extensionsHandlingNotifications--;

files/usr/share/cinnamon/applets/[email protected]/workspace.js

@@ -11,7 +11,7 @@ const {RESERVE_KEYS} = Me.imports.constants;
 var Workspace = class Workspace {
     constructor(params) {
         this.state = params.state;
-        this.state.connect({
+        this.stateConnectionId = this.state.connect({
             orientation: () => this.on_orientation_changed(false)
         });
         this.workspaceState = createStore({
@@ -421,6 +421,9 @@ var Workspace = class Workspace {
     }
 
     destroy() {
+        if (this.stateConnectionId) {
+            this.state.disconnect(this.stateConnectionId);
+        }
         this.signals.disconnectAllSignals();
         this.appGroups.forEach( appGroup => appGroup.destroy() );
         this.workspaceState.destroy();