Merge branch 'master' into feature/wlr-seat-touch

This commit is contained in:
Tony Crisci 2017-11-18 13:43:25 -05:00
commit f277f28eef
8 changed files with 140 additions and 35 deletions

View file

@ -46,7 +46,7 @@ int wlr_xcursor_manager_load(struct wlr_xcursor_manager *manager,
return 1;
}
theme->scale = scale;
theme->theme = wlr_xcursor_theme_load(NULL, manager->size * scale);
theme->theme = wlr_xcursor_theme_load(manager->name, manager->size * scale);
if (theme->theme == NULL) {
free(theme);
return 1;