hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-12-23 10:29:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1400 from emersion/xcursor-fixes

Browse source 
xcursor: port a few fixes
This commit is contained in:
Drew DeVault 2018-11-28 07:42:44 -05:00 committed by GitHub
commit a22311ec76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xcursor/xcursor.c
View file

@ -618,7 +618,7 @@ XcursorFileLoadImages (FILE *file, int size)
#endif #endif
#ifndef XCURSORPATH #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 #endif
static const char * static const char *
@ -839,7 +839,12 @@ XcursorScanTheme (const char *theme, const char *name)
* Recurse to scan inherited themes * Recurse to scan inherited themes
*/ */
for (i = inherits; i && f == NULL; i = _XcursorNextPath (i)) 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) if (inherits != NULL)
free (inherits); free (inherits);
return f; return f;