michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better error handling of magicleap demo args

This commit is contained in:
Alan Jeffrey 2019-06-06 15:44:52 -05:00
parent 966c836d4b
commit 3c91c1cc97
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
demo/magicleap/src/main.cpp
View File

@ -163,19 +163,23 @@ static void onNewInitArg(void* app_handle)
return; return;
} }
if (arg_list_len) { if (!arg_list_len) {
return;
}
if (MLResult_Ok != MLLifecycleGetInitArgByIndex(arg_list, 0, &arg)) { if (MLResult_Ok != MLLifecycleGetInitArgByIndex(arg_list, 0, &arg)) {
ML_LOG(Error, "%s: Failed to get init arg.", application_name); ML_LOG(Error, "%s: Failed to get init arg.", application_name);
return;
} }
if (MLResult_Ok != MLLifecycleGetFileInfoListLength(arg, &file_list_len)) { if (MLResult_Ok != MLLifecycleGetFileInfoListLength(arg, &file_list_len)) {
ML_LOG(Error, "%s: Failed to get file list length.", application_name); ML_LOG(Error, "%s: Failed to get file list length.", application_name);
return; return;
} }
if (!file_list_len) {
return;
} }
if (file_list_len) {
if (MLResult_Ok != MLLifecycleGetFileInfoByIndex(arg, 0, &file_info)) { if (MLResult_Ok != MLLifecycleGetFileInfoByIndex(arg, 0, &file_info)) {
ML_LOG(Error, "%s: Failed to get file info.", application_name); ML_LOG(Error, "%s: Failed to get file info.", application_name);
return; return;
@ -185,6 +189,10 @@ static void onNewInitArg(void* app_handle)
ML_LOG(Error, "%s: Failed to get file name.", application_name); ML_LOG(Error, "%s: Failed to get file name.", application_name);
return; return;
} }
if (!file_name) {
ML_LOG(Error, "%s: File name is null.", application_name);
return;
} }
// Tell pathfinder to load the file // Tell pathfinder to load the file
@ -198,6 +206,7 @@ static void onNewInitArg(void* app_handle)
return; return;
} }
ML_LOG(Info, "%s: Loading %s.", application_name, file_name);
magicleap_pathfinder_demo_load(app, file_name); magicleap_pathfinder_demo_load(app, file_name);
MLLifecycleFreeInitArgList(&arg_list); MLLifecycleFreeInitArgList(&arg_list);
} }