Fix issues in terms of 'global scope'

Author: nlpsuge

metadata.json

@@ -1,6 +1,6 @@
 {
     "_generated": "Generated by SweetTooth, do not edit",
-    "description": "Close and save open windows. And restore them. Most importantly, it supports both X11 and Wayland!\n\nMain features:\n- Close open windows\n- Save open windows\n- Restore saved open windows\n- Restore window state, including Always on Top,  Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Trash saved session\n- Search saved session by the session name fuzzily",
+    "description": "Close and save open windows. And restore them. Most importantly, it supports both X11 and Wayland!\n\nMain features:\n- Close open windows\n- Save open windows\n- Restore session(s)\n- Restore a session at startup. Please note that this feature is disabled by default. See https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager#how-to-restore-a-session-at-startup to learn how to enable and use it.\n- Restore window state, including Always on Top,  Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Trash saved session\n- Search saved session by the session name fuzzily",
     "name": "Another Window Session Manager",
     "shell-version": [
       "40",
@@ -9,5 +9,5 @@
     ],
     "url": "https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager",
     "uuid": "another-window-session-manager@gmail.com",
-    "version": 14
+    "version": 15
   }

restoreSession.js

@@ -182,6 +182,11 @@ var RestoreSession = class {
     }
 
     destroy() {
+        if (restoringApps) {
+            restoringApps.clear();
+            restoringApps = null;
+        }
+
         if (this._restoredApps) {
             this._restoredApps.clear();
             this._restoredApps = null;

ui/autostart.js

@@ -26,10 +26,6 @@ const PrefsUtils = Me.imports.utils.prefsUtils;
 const FileUtils = Me.imports.utils.fileUtils;
 
 
-const autostartDbusXml = ByteArray.toString(
-    Me.dir.get_child('dbus-interfaces').get_child('org.gnome.Shell.Extensions.awsm.Autostart.xml').load_contents(null)[1]
-);
-
 var AutostartServiceProvider = GObject.registerClass(
     class AutostartServiceProvider extends GObject.Object {
 
@@ -38,6 +34,9 @@ var AutostartServiceProvider = GObject.registerClass(
 
             this._log = new Log.Log();
 
+            this._autostartDbusXml = ByteArray.toString(
+                Me.dir.get_child('dbus-interfaces').get_child('org.gnome.Shell.Extensions.awsm.Autostart.xml').load_contents(null)[1]);
+
             this._autostartService = null;
             this._autostartDbusImpl = null;
 
@@ -61,7 +60,7 @@ var AutostartServiceProvider = GObject.registerClass(
 
             // Gio.DBusExportedObject.wrapJSObject(interfaceInfo, jsObj) is a private method of gjs
             // See: https://gitlab.gnome.org/GNOME/gjs/-/blob/master/modules/core/overrides/Gio.js#L391
-            this._autostartDbusImpl = Gio.DBusExportedObject.wrapJSObject(autostartDbusXml, this._autostartService);
+            this._autostartDbusImpl = Gio.DBusExportedObject.wrapJSObject(this._autostartDbusXml, this._autostartService);
             this._autostartDbusImpl.export(connection, '/org/gnome/Shell/Extensions/awsm');
 
         }