hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-15 11:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

xcursor: don't crash on broken permissions in X themes

Browse source 
ref #8079
This commit is contained in:
Vaxry 2024-10-12 15:18:34 +01:00
parent ee8116ac5d
commit c3f7c9bbb5
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/managers/XCursorManager.cpp
View file

@ -117,9 +117,11 @@ void CXCursorManager::loadTheme(std::string const& name, int size, float scale)
cursors = loadStandardCursors(themeName, lastLoadSize); cursors = loadStandardCursors(themeName, lastLoadSize);
} else { } else {
for (auto const& p : paths) { for (auto const& p : paths) {
auto dirCursors = loadAllFromDir(p, lastLoadSize); try {
std::copy_if(dirCursors.begin(), dirCursors.end(), std::back_inserter(cursors), auto dirCursors = loadAllFromDir(p, lastLoadSize);
[this](auto const& p) { return std::none_of(cursors.begin(), cursors.end(), [&p](auto const& dp) { return dp->shape == p->shape; }); }); std::copy_if(dirCursors.begin(), dirCursors.end(), std::back_inserter(cursors),
[this](auto const& p) { return std::none_of(cursors.begin(), cursors.end(), [&p](auto const& dp) { return dp->shape == p->shape; }); });
} catch (std::exception& e) { Debug::log(ERR, "XCursor path {} can't be loaded: threw error {}", p, e.what()); }
} }
} }