this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #2067 from locriacyber/fix-1

Skip empty menu option

authored by

Vadim Grigoruk and committed by
GitHub
c26048e4 90886c6a

+6 -2
+1
.gitignore
··· 4 4 *.suo 5 5 sexit 6 6 .vscode/ 7 + build/install_manifest.txt 7 8 build/vendor/ 8 9 build/uwp/tic/Debug/ 9 10 build/uwp/tic/Release/
+2 -2
src/studio/screens/console.c
··· 3733 3733 return NULL; 3734 3734 } 3735 3735 3736 - static void onHttpVesrsionGet(const net_get_data* data) 3736 + static void onHttpVersionGet(const net_get_data* data) 3737 3737 { 3738 3738 Console* console = (Console*)data->calldata; 3739 3739 ··· 4114 4114 4115 4115 #if defined (TIC_BUILD_WITH_LUA) 4116 4116 if(getConfig(console->studio)->checkNewVersion) 4117 - tic_net_get(console->net, "/api?fn=version", onHttpVesrsionGet, console); 4117 + tic_net_get(console->net, "/api?fn=version", onHttpVersionGet, console); 4118 4118 #endif 4119 4119 } 4120 4120
+3
src/studio/screens/menu.c
··· 25 25 #include "studio/fs.h" 26 26 27 27 #include <math.h> 28 + #include <string.h> 28 29 29 30 #define ANIM_STATES(macro) \ 30 31 macro(idle) \ ··· 89 90 { 90 91 Menu *menu = data; 91 92 menu->pos = (menu->pos + (menu->count - 1)) % menu->count; 93 + if (strcmp("", menu->items[menu->pos].label) == 0) return menuUpDone(data); 92 94 menu->anim.pos = 0; 93 95 menu->anim.movie = resetMovie(&menu->anim.idle); 94 96 } ··· 97 99 { 98 100 Menu *menu = data; 99 101 menu->pos = (menu->pos + (menu->count + 1)) % menu->count; 102 + if (strcmp("", menu->items[menu->pos].label) == 0) return menuDownDone(data); 100 103 menu->anim.pos = 0; 101 104 menu->anim.movie = resetMovie(&menu->anim.idle); 102 105 }