blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1339 from MrSorcus/master 

Fix "variable ‘cursor_default’ set but not used"
This commit is contained in:
emersion 2018-10-28 12:19:17 +01:00 committed by GitHub
parent fe247e20a3 7c540aa9fe
commit 2ae2c247a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rootston/desktop.c
View File

@ -882,14 +882,18 @@ struct roots_desktop *desktop_create(struct roots_server *server,
desktop->tablet_v2 = wlr_tablet_v2_create(server->wl_display); desktop->tablet_v2 = wlr_tablet_v2_create(server->wl_display);
const char *cursor_theme = NULL; const char *cursor_theme = NULL;
#ifdef WLR_HAS_XWAYLAND
const char *cursor_default = ROOTS_XCURSOR_DEFAULT; const char *cursor_default = ROOTS_XCURSOR_DEFAULT;
#endif
struct roots_cursor_config *cc = struct roots_cursor_config *cc =
roots_config_get_cursor(config, ROOTS_CONFIG_DEFAULT_SEAT_NAME); roots_config_get_cursor(config, ROOTS_CONFIG_DEFAULT_SEAT_NAME);
if (cc != NULL) { if (cc != NULL) {
cursor_theme = cc->theme; cursor_theme = cc->theme;
#ifdef WLR_HAS_XWAYLAND
if (cc->default_image != NULL) { if (cc->default_image != NULL) {
cursor_default = cc->default_image; cursor_default = cc->default_image;
} }
#endif
} }
char cursor_size_fmt[16]; char cursor_size_fmt[16];