summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@gmail.com>2019-03-08 22:06:38 -0500
committerDrew DeVault <sir@cmpwn.com>2019-03-11 10:56:20 -0400
commitf0eedfa8e0b14e3b8b04c8b0dd7654e3da17307b (patch)
treec140fbad5a2fa6c0d07109cc71578c89058cf4d4
parente28163249f7bb4d60cb6855cb1676a7bbe4a65fa (diff)
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 48ef39df4..5ad481452 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -624,8 +624,8 @@ struct criteria *criteria_parse(char *raw, char **error_arg) {
in_quotes = false;
}
unescape(value);
+ sway_log(SWAY_DEBUG, "Found pair: %s=%s", name, value);
}
- sway_log(SWAY_DEBUG, "Found pair: %s=%s", name, value);
if (!parse_token(criteria, name, value)) {
*error_arg = error;
goto cleanup;
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 9888ddfcb..245326a1e 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -705,8 +705,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
seat->cursor->xcursor_manager =
wlr_xcursor_manager_create(cursor_theme, 24);
if (sway_assert(seat->cursor->xcursor_manager,
- "Cannot create XCursor manager for theme %s",
- cursor_theme)) {
+ "Cannot create XCursor manager for theme")) {
return;
}
}