aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Jeff Peeler <jpeeler@gmail.com>2019-03-08 22:06:38 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-03-11 10:56:20 -0400
commitf0eedfa8e0b14e3b8b04c8b0dd7654e3da17307b (patch)
treec140fbad5a2fa6c0d07109cc71578c89058cf4d4
parentFix crash when moving window to scratchpad (diff)
downloadsway-f0eedfa8e0b14e3b8b04c8b0dd7654e3da17307b.tar.gz
sway-f0eedfa8e0b14e3b8b04c8b0dd7654e3da17307b.tar.zst
sway-f0eedfa8e0b14e3b8b04c8b0dd7654e3da17307b.zip
fix "directive argument is null" errors
-rw-r--r--sway/criteria.c2
-rw-r--r--sway/input/seat.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/sway/criteria.c b/sway/criteria.c
index 48ef39df..5ad48145 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -624,8 +624,8 @@ struct criteria *criteria_parse(char *raw, char **error_arg) {
624 in_quotes = false; 624 in_quotes = false;
625 } 625 }
626 unescape(value); 626 unescape(value);
627 sway_log(SWAY_DEBUG, "Found pair: %s=%s", name, value);
627 } 628 }
628 sway_log(SWAY_DEBUG, "Found pair: %s=%s", name, value);
629 if (!parse_token(criteria, name, value)) { 629 if (!parse_token(criteria, name, value)) {
630 *error_arg = error; 630 *error_arg = error;
631 goto cleanup; 631 goto cleanup;
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 9888ddfc..245326a1 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -705,8 +705,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
705 seat->cursor->xcursor_manager = 705 seat->cursor->xcursor_manager =
706 wlr_xcursor_manager_create(cursor_theme, 24); 706 wlr_xcursor_manager_create(cursor_theme, 24);
707 if (sway_assert(seat->cursor->xcursor_manager, 707 if (sway_assert(seat->cursor->xcursor_manager,
708 "Cannot create XCursor manager for theme %s", 708 "Cannot create XCursor manager for theme")) {
709 cursor_theme)) {
710 return; 709 return;
711 } 710 }
712 } 711 }