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

merged from nx-hbmenu master

Browse Source
This commit is contained in:
NightlyFox 2018-09-29 06:35:59 -05:00
commit bf01ed1d39
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/menu-list.c
View File

@ -209,8 +209,15 @@ int themeMenuScan(const char* target) {
menuEntry_s* me = menuCreateEntry(ENTRY_TYPE_THEME); menuEntry_s* me = menuCreateEntry(ENTRY_TYPE_THEME);
if(me) { if(me) {
<<<<<<< HEAD
if(menuEntryLoad(me, "Default Theme", false));//Create Default theme Menu Entry if(menuEntryLoad(me, "Default Theme", false));//Create Default theme Menu Entry
menuAddEntryToFront(me); menuAddEntryToFront(me);
=======
if(menuEntryLoad(me, "Default Theme", false))//Create Default theme Menu Entry
menuAddEntryToFront(me);
else
menuDeleteEntry(me);
>>>>>>> 5b35642de73c65ee63ae904288f1cbaea6a8e884
} }
// Swap the menu and clear the previous menu // Swap the menu and clear the previous menu
s_curMenu = !s_curMenu; s_curMenu = !s_curMenu;