aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@gmail.com>2019-03-08 22:06:38 -0500
committerDrew DeVault <sir@cmpwn.com>2019-03-09 14:59:28 -0700
commita73e8f1328a247766f4ff78fdc73b38488dec385 (patch)
tree63476eea176095fa02c65f040c831390316825ce
parent5fab8a2ad4c05fb7bfdbb45915b8abf7ebeab5fe (diff)
downloadsway-a73e8f1328a247766f4ff78fdc73b38488dec385.zip
sway-a73e8f1328a247766f4ff78fdc73b38488dec385.tar.gz
sway-a73e8f1328a247766f4ff78fdc73b38488dec385.tar.bz2
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 48ef39d..5ad4814 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 9888ddf..245326a 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;
}
}