izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix string concatenation of image in assets dir

Browse Source
This commit is contained in:
ReenigneArcher
2022-10-15 16:37:18 -04:00
parent 8e63b2523a
commit 264c9272df
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/process.cpp
+7 -5
View File
@@ -202,10 +202,11 @@ std::string proc_t::get_app_image(int app_id) {
return SUNSHINE_ASSETS_DIR "/box.png"; return SUNSHINE_ASSETS_DIR "/box.png";
} }
auto default_image = SUNSHINE_ASSETS_DIR "/box.png";
auto app_image_path = _apps[app_index].image_path; auto app_image_path = _apps[app_index].image_path;
if(app_image_path.empty()) { if(app_image_path.empty()) {
// image is empty, return default box image // image is empty, return default box image
return SUNSHINE_ASSETS_DIR "/box.png"; return default_image;
} }
// get the image extension and convert it to lowercase // get the image extension and convert it to lowercase
@@ -214,12 +215,13 @@ std::string proc_t::get_app_image(int app_id) {
// return the default box image if extension is not "png" // return the default box image if extension is not "png"
if(image_extension != ".png") { if(image_extension != ".png") {
return SUNSHINE_ASSETS_DIR "/box.png"; return default_image;
} }
// check if image is in assets directory // check if image is in assets directory
if(std::filesystem::exists(SUNSHINE_ASSETS_DIR + app_image_path)) { auto full_image_path = std::filesystem::path(SUNSHINE_ASSETS_DIR) / app_image_path;
return SUNSHINE_ASSETS_DIR + app_image_path; if(std::filesystem::exists(full_image_path)) {
return full_image_path.string();
} }
else if(app_image_path == "./assets/steam.png") { else if(app_image_path == "./assets/steam.png") {
// handle old default steam image definition // handle old default steam image definition
@@ -230,7 +232,7 @@ std::string proc_t::get_app_image(int app_id) {
std::error_code code; std::error_code code;
if(!std::filesystem::exists(app_image_path, code)) { if(!std::filesystem::exists(app_image_path, code)) {
// return default box image if image does not exist // return default box image if image does not exist
return SUNSHINE_ASSETS_DIR "/box.png"; return default_image;
} }
// image is a png, and not in assets directory // image is a png, and not in assets directory