diff options
| -rw-r--r-- | gjs/src/application.ts | 2 | ||||
| -rw-r--r-- | src/astal.vala | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gjs/src/application.ts b/gjs/src/application.ts index 0c14278..13927d8 100644 --- a/gjs/src/application.ts +++ b/gjs/src/application.ts @@ -85,7 +85,7 @@ class AstalJS extends Astal.Application { }) if (!this.acquire_socket()) - return client(msg => Astal.Application.send_message(this.instance_name, msg)!, ...programArgs) + return client(msg => Astal.Application.send_message(this.instanceName, msg)!, ...programArgs) if (css) this.apply_css(css, false) diff --git a/src/astal.vala b/src/astal.vala index 6868a7e..80ad047 100644 --- a/src/astal.vala +++ b/src/astal.vala @@ -193,9 +193,6 @@ public class Application : Gtk.Application { } public new void quit() throws DBusError, IOError { - if (instance_name == null) - instance_name = "astal"; - if (service != null) { if (FileUtils.test(socket_path, GLib.FileTest.EXISTS)){ try { @@ -210,6 +207,9 @@ public class Application : Gtk.Application { } construct { + if (instance_name == null) + instance_name = "astal"; + shutdown.connect(() => { try { quit(); } catch(Error err) {} }); Unix.signal_add(1, () => { try { quit(); } catch(Error err) {} }, Priority.HIGH); Unix.signal_add(2, () => { try { quit(); } catch(Error err) {} }, Priority.HIGH); |