[Scummvm-git-logs] scummvm master -> 2dbe4e90670b7263a5fa092cc83507087d462c45

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2dbe4e9067 COMMON: Fall back to engine icon in taskbar


Commit: 2dbe4e90670b7263a5fa092cc83507087d462c45
    https://github.com/scummvm/scummvm/commit/2dbe4e90670b7263a5fa092cc83507087d462c45
Author: trembyle (sean.patrick.brody at gmail.com)
Date: 2021-04-24T23:54:17+01:00

Commit Message:
COMMON: Fall back to engine icon in taskbar

When an icon for game ID is not found, use the engine icon instead.
This provides a fallback so that every game doesn't need an icon.

Changed paths:
    common/taskbar.h


diff --git a/common/taskbar.h b/common/taskbar.h
index cdcee74913..24cae5ac59 100644
--- a/common/taskbar.h
+++ b/common/taskbar.h
@@ -167,6 +167,7 @@ protected:
 		Common::String targetIcon = target + extension;
 		Common::String qualifiedIcon = ConfMan.get("engineid") + "-" + ConfMan.get("gameid") + extension;
 		Common::String gameIcon = ConfMan.get("gameid") + extension;
+		Common::String engineIcon = ConfMan.get("engineid") + extension;
 
 #define TRY_ICON_PATH(path) { \
 Common::FSNode node((path)); \
@@ -177,18 +178,22 @@ return (path); \
 			TRY_ICON_PATH(iconsPath + "/" + targetIcon);
 			TRY_ICON_PATH(iconsPath + "/" + qualifiedIcon);
 			TRY_ICON_PATH(iconsPath + "/" + gameIcon);
+			TRY_ICON_PATH(iconsPath + "/" + engineIcon);
 			TRY_ICON_PATH(iconsPath + "/icons/" + targetIcon);
 			TRY_ICON_PATH(iconsPath + "/icons/" + qualifiedIcon);
 			TRY_ICON_PATH(iconsPath + "/icons/" + gameIcon);
+			TRY_ICON_PATH(iconsPath + "/icons/" + engineIcon);
 		}
 
 		if (!extraPath.empty()) {
 			TRY_ICON_PATH(extraPath + "/" + targetIcon);
 			TRY_ICON_PATH(extraPath + "/" + qualifiedIcon);
 			TRY_ICON_PATH(extraPath + "/" + gameIcon);
+			TRY_ICON_PATH(extraPath + "/" + engineIcon);
 			TRY_ICON_PATH(extraPath + "/icons/" + targetIcon);
 			TRY_ICON_PATH(extraPath + "/icons/" + qualifiedIcon);
 			TRY_ICON_PATH(extraPath + "/icons/" + gameIcon);
+			TRY_ICON_PATH(extraPath + "/icons/" + engineIcon);
 		}
 #undef TRY_ICON_PATH