From 573c29ab85d144a30ca258f14c828791a7617a93 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 15 Apr 2020 18:19:49 +0200 Subject: [PATCH] Don't assert the cursor theme loads If it doesn't load, it's a runtime error, so we shouldn't use an assertion. --- sway/input/seat.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sway/input/seat.c b/sway/input/seat.c index c3eae65ca..50f45d0e1 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -912,8 +912,10 @@ void seat_configure_xcursor(struct sway_seat *seat) { wlr_xcursor_manager_destroy(seat->cursor->xcursor_manager); seat->cursor->xcursor_manager = wlr_xcursor_manager_create(cursor_theme, cursor_size); - sway_assert(seat->cursor->xcursor_manager, - "Cannot create XCursor manager for theme"); + if (!seat->cursor->xcursor_manager) { + sway_log(SWAY_ERROR, + "Cannot create XCursor manager for theme '%s'", cursor_theme); + } } for (int i = 0; i < root->outputs->length; ++i) { @@ -922,11 +924,11 @@ void seat_configure_xcursor(struct sway_seat *seat) { bool result = wlr_xcursor_manager_load(seat->cursor->xcursor_manager, output->scale); - - sway_assert(!result, - "Cannot load xcursor theme for output '%s' with scale %f", - // TODO: Fractional scaling - output->name, (double)output->scale); + if (!result) { + sway_log(SWAY_ERROR, + "Cannot load xcursor theme for output '%s' with scale %f", + output->name, output->scale); + } } cursor_set_image(seat->cursor, "left_ptr", NULL);