mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-07-13 21:02:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Almamu:main' into main

Browse Source
This commit is contained in:
Vaxry 2023-04-21 02:10:36 +01:00 committed by GitHub
commit 8e1ae5e627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/WallpaperEngine/Render/CTextureCache.cpp
View File

@ -24,21 +24,34 @@ const ITexture* CTextureCache::resolve (const std::string& filename)
// search for the texture in all the different containers just in case
for (auto it : this->getContext ().getApp ().getBackgrounds ())
{
const ITexture* texture = it.second->getContainer ()->readTexture (filename);
try
{
const ITexture* texture = it.second->getContainer ()->readTexture (filename);
this->store (filename, texture);
this->store (filename, texture);
return texture;
return texture;
}
catch (CAssetLoadException& ex)
{
// ignored, this happens if we're looking at the wrong background
}
}
if (this->getContext ().getApp ().getDefaultBackground () != nullptr)
{
const ITexture* texture =
this->getContext ().getApp ().getDefaultBackground ()->getContainer ()->readTexture (filename);
try
{
const ITexture* texture = this->getContext ().getApp ().getDefaultBackground ()->getContainer ()->readTexture (filename);
this->store (filename, texture);
this->store (filename, texture);
return texture;
return texture;
}
catch (CAssetLoadException& ex)
{
// ignored, this happens if we're looking at the wrong background
}
}
throw CAssetLoadException (filename, "Cannot find file");