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

CDirectory should not use sLog for errors

Browse Source 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
Alexis Maiquez 2023-12-12 02:13:06 +01:00
parent b58cd97255
commit 89a2178308
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/WallpaperEngine/Application/CWallpaperApplication.cpp
View File

@ -7,6 +7,7 @@
#include "WallpaperEngine/Logging/CLog.h"
#include "WallpaperEngine/Render/CRenderContext.h"
#include "WallpaperEngine/Application/CApplicationState.h"
#include "WallpaperEngine/Assets/CAssetLoadException.h"
#include "WallpaperEngine/Audio/Drivers/Detectors/CPulseAudioPlayingDetector.h"
#include "WallpaperEngine/Input/Drivers/CGLFWMouseInput.h"
@ -54,7 +55,7 @@ namespace WallpaperEngine::Application
{
container.add (new CDirectory ("../share/"));
}
catch (std::runtime_error& ex)
catch (CAssetLoadException& ex)
{
relative = false;
}
@ -63,7 +64,7 @@ namespace WallpaperEngine::Application
{
container.add (new CDirectory (DATADIR));
}
catch (std::runtime_error& ex)
catch (CAssetLoadException& ex)
{
absolute = false;
}

4
src/WallpaperEngine/Assets/CDirectory.cpp
View File

@ -15,10 +15,10 @@ CDirectory::CDirectory (std::filesystem::path basepath) :
struct stat buffer {};
if (stat (this->m_basepath.c_str (), &buffer) != 0)
sLog.exception ("Cannot find ", this->m_basepath, ". This folder is required for wallpaper engine to work");
throw CAssetLoadException (this->m_basepath, "Cannot find directory");
if (!S_ISDIR(buffer.st_mode))
sLog.exception ("Cannot find ", this->m_basepath, ". There's an assets file in it's place");
throw CAssetLoadException (this->m_basepath, "Expected directory but found a file");
}
CDirectory::~CDirectory ()