]> git.mdlowis.com Git - proto/labwc.git/commitdiff
server: fix wlr_xcursor_manager_load() ret val
authorJohan Malm <jgm323@gmail.com>
Tue, 11 Aug 2020 20:07:23 +0000 (21:07 +0100)
committerJohan Malm <jgm323@gmail.com>
Tue, 11 Aug 2020 20:07:23 +0000 (21:07 +0100)
Return value changed in wlroots 0.11.0

src/server.c

index 2af99ada54d52093decc287bc8365dc3dada74e7..6db7e1c738393121e7cb7a822105149798b29d73 100644 (file)
@@ -165,13 +165,6 @@ void server_init(struct server *server)
        }
        wlr_cursor_attach_output_layout(server->cursor, server->output_layout);
 
-       // This is done below
-       // server->cursor_mgr = wlr_xcursor_manager_create(NULL, XCURSOR_SIZE);
-       // if (!server->cursor_mgr) {
-       //      wlr_log(WLR_ERROR, "cannot create xcursor manager");
-       //      exit(EXIT_FAILURE);
-       //}
-
        server->cursor_motion.notify = cursor_motion;
        wl_signal_add(&server->cursor->events.motion, &server->cursor_motion);
        server->cursor_motion_absolute.notify = cursor_motion_absolute;
@@ -245,10 +238,8 @@ void server_init(struct server *server)
 
        server->cursor_mgr =
                wlr_xcursor_manager_create(XCURSOR_DEFAULT, XCURSOR_SIZE);
-       if (!server->cursor_mgr) {
+       if (!server->cursor_mgr)
                wlr_log(WLR_ERROR, "cannot create xwayland xcursor manager");
-               exit(EXIT_FAILURE);
-       }
 
        if (setenv("DISPLAY", server->xwayland->display_name, true) < 0)
                wlr_log_errno(WLR_ERROR, "unable to set DISPLAY for xwayland");
@@ -256,7 +247,7 @@ void server_init(struct server *server)
                wlr_log(WLR_DEBUG, "xwayland is running on display %s",
                        server->xwayland->display_name);
 
-       if (wlr_xcursor_manager_load(server->cursor_mgr, 1))
+       if (!wlr_xcursor_manager_load(server->cursor_mgr, 1))
                wlr_log(WLR_ERROR, "cannot load xwayland xcursor theme");
 
        struct wlr_xcursor *xcursor;