this repo has no description
0
fork

Configure Feed

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

fixed crash when you load tic without any langs

nesbox 42047e15 9a92615c

+27 -27
+17 -22
include/tic80_config.h
··· 33 33 // # endif /* TARGET_OS_IPHONE */ 34 34 #endif /* defined(__APPLE__) */ 35 35 36 - #if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) 37 - # undef __TIC_WINDOWS__ 38 - # define __TIC_WINDOWS__ 1 39 - # define TIC_MODULE_EXT ".dll" 40 - # if defined(_MSC_VER) && defined(_USING_V110_SDK71_) 41 - # define __TIC_WIN7__ 1 36 + #if !defined(__LIBRETRO__) 37 + # if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) 38 + # undef __TIC_WINDOWS__ 39 + # define __TIC_WINDOWS__ 1 40 + # define TIC_MODULE_EXT ".dll" 41 + # if defined(_MSC_VER) && defined(_USING_V110_SDK71_) 42 + # define __TIC_WIN7__ 1 43 + # endif 44 + # endif 45 + # if defined(ANDROID) || defined(__ANDROID__) 46 + # undef __TIC_ANDROID__ 47 + # define __TIC_ANDROID__ 1 48 + # define TIC_MODULE_EXT ".so" 49 + # elif (defined(linux) || defined(__linux) || defined(__linux__)) 50 + # undef __TIC_LINUX__ 51 + # define __TIC_LINUX__ 1 52 + # define TIC_MODULE_EXT ".so" 42 53 # endif 43 - #endif 44 - 45 - #if defined(ANDROID) || defined(__ANDROID__) 46 - # undef __TIC_ANDROID__ 47 - # define __TIC_ANDROID__ 1 48 - # define TIC_MODULE_EXT ".so" 49 - #elif (defined(linux) || defined(__linux) || defined(__linux__)) 50 - # undef __TIC_LINUX__ 51 - # define __TIC_LINUX__ 1 52 - # define TIC_MODULE_EXT ".so" 53 - #endif 54 - 55 - #if defined(__LIBRETRO__) 56 - #ifdef TIC_MODULE_EXT 57 - #undef TIC_MODULE_EXT 58 - #endif 59 54 #endif 60 55 61 56 #if defined(TIC_RUNTIME_STATIC)
+3 -1
src/script.c
··· 172 172 return script; 173 173 } 174 174 175 - return *Scripts; 175 + static const tic_script empty; 176 + 177 + return *Scripts ? *Scripts : ∅ 176 178 }
+7 -4
src/studio/screens/console.c
··· 764 764 static char* getDemoCartPath(char* path, const tic_script* script) 765 765 { 766 766 strcpy(path, TIC_LOCAL_VERSION "default_"); 767 - strcat(path, script->name); 767 + 768 + if(script && script->name) 769 + strcat(path, script->name); 770 + 768 771 strcat(path, ".tic"); 769 772 770 773 return path; ··· 1216 1219 } 1217 1220 else if(count == 1) 1218 1221 { 1219 - loadDemo(console, *tic_scripts()); 1222 + loadDemo(console, tic_get_script(console->tic)); 1220 1223 done = true; 1221 1224 } 1222 1225 else if(console->desc->count) ··· 1732 1735 { 1733 1736 if (console->desc->count == 1) 1734 1737 { 1735 - onLoadDemoCommand(console, *tic_scripts()); 1738 + onLoadDemoCommand(console, tic_get_script(console->tic)); 1736 1739 } 1737 1740 else 1738 1741 { ··· 4313 4316 { 4314 4317 if(!start->embed) 4315 4318 { 4316 - loadDemo(console, *tic_scripts()); 4319 + loadDemo(console, tic_get_script(tic)); 4317 4320 4318 4321 if(!console->args.cli) 4319 4322 {