From 0d54ccd75607a084d1429c5a07d069102ce4c6b6 Mon Sep 17 00:00:00 2001 From: nkk71 Date: Thu, 28 Sep 2017 15:50:26 +0300 Subject: [PATCH] For Android ROMs use default icon if no custom icon is set --- .../multirom/icons/romic_android_default.png | Bin 0 -> 12503 bytes multirom.c | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 install_zip/prebuilt-installer/multirom/icons/romic_android_default.png diff --git a/install_zip/prebuilt-installer/multirom/icons/romic_android_default.png b/install_zip/prebuilt-installer/multirom/icons/romic_android_default.png new file mode 100644 index 0000000000000000000000000000000000000000..3cbaea1e90799a9282a6bb06cd6d4104560f46f5 GIT binary patch literal 12503 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 literal 0 HcmV?d00001 diff --git a/multirom.c b/multirom.c index 97f35e44..6efb3b11 100644 --- a/multirom.c +++ b/multirom.c @@ -3032,6 +3032,8 @@ int multirom_run_scripts(const char *type, struct multirom_rom *rom) #define USER_IC_PATH_LEN 46 #define DEFAULT_ICON "/icons/romic_default.png" #define DEFAULT_ICON_LEN 24 +#define DEFAULT_ANDROID_ICON "/icons/romic_android_default.png" +#define DEFAULT_ANDROID_ICON_LEN 32 void multirom_find_rom_icon(struct multirom_rom *rom) { @@ -3096,7 +3098,14 @@ void multirom_find_rom_icon(struct multirom_rom *rom) if(f) fclose(f); - len = strlen(mrom_dir()) + DEFAULT_ICON_LEN + 1; - rom->icon_path = realloc(rom->icon_path, len); - snprintf(rom->icon_path, len, "%s%s", mrom_dir(), DEFAULT_ICON); + if (rom->type & MASK_ANDROID) { + len = strlen(mrom_dir()) + DEFAULT_ANDROID_ICON_LEN + 1; + rom->icon_path = realloc(rom->icon_path, len); + snprintf(rom->icon_path, len, "%s%s", mrom_dir(), DEFAULT_ANDROID_ICON); + } + else { + len = strlen(mrom_dir()) + DEFAULT_ICON_LEN + 1; + rom->icon_path = realloc(rom->icon_path, len); + snprintf(rom->icon_path, len, "%s%s", mrom_dir(), DEFAULT_ICON); + } }