diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-11-28 07:42:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 07:42:44 -0500 |
| commit | a22311ec76802d2d8eb4bc3fcb3e9b713f7cd1c6 (patch) | |
| tree | 7ca18856f9c7e3f1503ed2649c5799ab3f9a61db | |
| parent | 3033f33a1d0923c6e046167d0dec7eec4d9d7a68 (diff) | |
| parent | 14f45c056f625baab6b0f7407fa58449dd277a7a (diff) | |
| download | wlroots-a22311ec76802d2d8eb4bc3fcb3e9b713f7cd1c6.tar.xz | |
Merge pull request #1400 from emersion/xcursor-fixes
xcursor: port a few fixes
| -rw-r--r-- | xcursor/xcursor.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xcursor/xcursor.c b/xcursor/xcursor.c index 6690da1a..5b20fc56 100644 --- a/xcursor/xcursor.c +++ b/xcursor/xcursor.c @@ -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; |