mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-26 06:35:58 +01:00
Merge pull request #1339 from MrSorcus/master
Fix "variable ‘cursor_default’ set but not used"
This commit is contained in:
commit
2ae2c247a0
1 changed files with 4 additions and 0 deletions
|
@ -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];
|
||||||
|
|
Loading…
Reference in a new issue