mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't delete the fileassoc entry when loading the icon failed.

Browse Source
This commit is contained in:
yellows8 2020-04-04 12:55:55 -04:00
parent 7f1a9f4f29
commit 88fe495bd8
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/menu-entry.c
View File

@ -527,7 +527,7 @@ bool menuEntryLoad(menuEntry_s* me, const char* name, bool shortcut, bool check_
} }
void menuEntryFileassocLoad(const char* filepath) { void menuEntryFileassocLoad(const char* filepath) {
bool success=0, success2=0; bool success=0, iconLoaded=0;
menuEntry_s* me = NULL; menuEntry_s* me = NULL;
config_setting_t *fileassoc = NULL, *targets = NULL, *target = NULL; config_setting_t *fileassoc = NULL, *targets = NULL, *target = NULL;
@ -615,7 +615,7 @@ void menuEntryFileassocLoad(const char* filepath) {
if ((target_file_extension[0]!=0) == (target_filename[0]!=0)) continue; if ((target_file_extension[0]!=0) == (target_filename[0]!=0)) continue;
me = menuCreateEntry(ENTRY_TYPE_FILEASSOC); me = menuCreateEntry(ENTRY_TYPE_FILEASSOC);
success2 = 0; iconLoaded = 0;
if (me) { if (me) {
strncpy(me->path, app_path, sizeof(me->path)); strncpy(me->path, app_path, sizeof(me->path));
@ -634,22 +634,17 @@ void menuEntryFileassocLoad(const char* filepath) {
} }
me->fileassoc_str[sizeof(me->fileassoc_str)-1] = 0; me->fileassoc_str[sizeof(me->fileassoc_str)-1] = 0;
if (target_icon_path[0]) success2 = menuEntryLoadExternalIcon(me, target_icon_path); if (target_icon_path[0]) iconLoaded = menuEntryLoadExternalIcon(me, target_icon_path);
if (!success2 && main_icon_path[0]) success2 = menuEntryLoadExternalIcon(me, main_icon_path); if (!iconLoaded && main_icon_path[0]) iconLoaded = menuEntryLoadExternalIcon(me, main_icon_path);
if (success2) { if (iconLoaded) {
menuEntryParseIcon(me); menuEntryParseIcon(me);
} else { } else {
success2 = menuEntryImportIconGfx(me, app_icon_gfx, app_icon_gfx_small); iconLoaded = menuEntryImportIconGfx(me, app_icon_gfx, app_icon_gfx_small);
} }
} }
if (me) { if (me) menuFileassocAddEntry(me);
if (success2)
menuFileassocAddEntry(me);
else
menuDeleteEntry(me, 0);
}
} }
} }
} }