mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-12-23 10:29:49 +01:00
Merge pull request #1400 from emersion/xcursor-fixes
xcursor: port a few fixes
This commit is contained in:
commit
a22311ec76
1 changed files with 7 additions and 2 deletions
|
@ -618,7 +618,7 @@ XcursorFileLoadImages (FILE *file, int size)
|
|||
#endif
|
||||
|
||||
#ifndef XCURSORPATH
|
||||
#define XCURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:~/.cursors:/usr/share/cursors/xorg-x11:"ICONDIR
|
||||
#define XCURSORPATH "~/.local/share/icons:~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR
|
||||
#endif
|
||||
|
||||
static const char *
|
||||
|
@ -839,7 +839,12 @@ XcursorScanTheme (const char *theme, const char *name)
|
|||
* Recurse to scan inherited themes
|
||||
*/
|
||||
for (i = inherits; i && f == NULL; i = _XcursorNextPath (i))
|
||||
f = XcursorScanTheme (i, name);
|
||||
{
|
||||
if (strcmp(i, theme) != 0)
|
||||
f = XcursorScanTheme (i, name);
|
||||
else
|
||||
printf("Not calling XcursorScanTheme because of circular dependency: %s. %s", i, name);
|
||||
}
|
||||
if (inherits != NULL)
|
||||
free (inherits);
|
||||
return f;
|
||||
|
|
Loading…
Reference in a new issue