From 25528b00006745b4def7d2f61cc910592b4b3ae9 Mon Sep 17 00:00:00 2001 From: gnat Date: Sun, 13 Oct 2024 15:25:47 -0700 Subject: check that conn is not null --- lib/hyprland/hyprland.vala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/hyprland') diff --git a/lib/hyprland/hyprland.vala b/lib/hyprland/hyprland.vala index 3886486..8834ea2 100644 --- a/lib/hyprland/hyprland.vala +++ b/lib/hyprland/hyprland.vala @@ -158,8 +158,10 @@ public class Hyprland : Object { out DataInputStream stream ) throws Error { conn = connection("socket"); - conn.output_stream.write(message.data, null); - stream = new DataInputStream(conn.input_stream); + if (conn != null) { + conn.output_stream.write(message.data, null); + stream = new DataInputStream(conn.input_stream); + } } public string message(string message) { -- cgit v1.2.3 From f8745db77f62c743496a6b22211a4ac1ca7c86e3 Mon Sep 17 00:00:00 2001 From: Aylur Date: Mon, 14 Oct 2024 09:39:32 +0000 Subject: lib(hyprland): check if conn and strea is not null --- lib/hyprland/hyprland.vala | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) (limited to 'lib/hyprland') diff --git a/lib/hyprland/hyprland.vala b/lib/hyprland/hyprland.vala index 8834ea2..ea95cab 100644 --- a/lib/hyprland/hyprland.vala +++ b/lib/hyprland/hyprland.vala @@ -161,42 +161,40 @@ public class Hyprland : Object { if (conn != null) { conn.output_stream.write(message.data, null); stream = new DataInputStream(conn.input_stream); + } else { + stream = null; + critical("could not write to the Hyprland socket"); } } public string message(string message) { - SocketConnection conn; - DataInputStream stream; + SocketConnection? conn; + DataInputStream? stream; try { write_socket(message, out conn, out stream); - return stream.read_upto("\x04", -1, null, null); + if (stream != null && conn != null) { + var res = stream.read_upto("\x04", -1, null, null); + conn.close(null); + return res; + } } catch (Error err) { critical(err.message); - } finally { - try { - if (conn != null) - conn.close(null); - } catch (Error err) { - critical(err.message); - } } return ""; } public async string message_async(string message) { - SocketConnection conn; - DataInputStream stream; + SocketConnection? conn; + DataInputStream? stream; try { write_socket(message, out conn, out stream); - return yield stream.read_upto_async("\x04", -1, Priority.DEFAULT, null, null); - } catch (Error err) { - critical(err.message); - } finally { - try { + if (stream != null && conn != null) { + var res = yield stream.read_upto_async("\x04", -1, Priority.DEFAULT, null, null); conn.close(null); - } catch (Error err) { - critical(err.message); + return res; } + } catch (Error err) { + critical(err.message); } return ""; } -- cgit v1.2.3 From 7e484188e7492ac7945c854bcc3f26cec1863c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= Date: Mon, 28 Oct 2024 02:15:21 +0100 Subject: fix: #57 hyprland fullscreen enum (#58) --- lib/hyprland/client.vala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/hyprland') diff --git a/lib/hyprland/client.vala b/lib/hyprland/client.vala index 3df644b..3f2d0fb 100644 --- a/lib/hyprland/client.vala +++ b/lib/hyprland/client.vala @@ -73,10 +73,11 @@ public class Client : Object { } } +[Flags] public enum Fullscreen { CURRENT = -1, NONE = 0, - FULLSCREEN = 1, - MAXIMIZED = 2, + MAXIMIZED = 1, + FULLSCREEN = 2, } } -- cgit v1.2.3