kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid segfault when SDL_JoystickNameForIndex returns null (no joystick for that id.)

Browse Source
This commit is contained in:
bendmorris
2014-02-06 16:54:54 -05:00
parent 770350fd4c
commit 94a0ba8f2f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/include/Display.h
View File

@@ -437,7 +437,7 @@ public:
virtual void setMultitouchActive(bool inActive) { } virtual void setMultitouchActive(bool inActive) { }
virtual bool getMultitouchActive() { return false; } virtual bool getMultitouchActive() { return false; }
virtual const char *getJoystickName(int id) { return ""; } virtual const char *getJoystickName(int id) { return NULL; }
Matrix GetFullMatrix(bool inStageScaling); Matrix GetFullMatrix(bool inStageScaling);
bool FinishEditOnEnter(); bool FinishEditOnEnter();

2
project/src/common/ExternalInterface.cpp
View File

@@ -1267,7 +1267,7 @@ value lime_stage_get_joystick_name(value inStage, value inId)
if (AbstractToObject(inStage,stage)) if (AbstractToObject(inStage,stage))
{ {
const char *joystickName = stage->getJoystickName(val_int(inId)); const char *joystickName = stage->getJoystickName(val_int(inId));
return alloc_string(joystickName); if (joystickName != NULL) return alloc_string(joystickName);
} }
#endif #endif
return alloc_null(); return alloc_null();