HOTFIX #924, Correct AppId during initial start

Due to a merge the setting of this to its final value got moved. Need to use "Pending" value, not the one in the table record.
nasa · Oct 21, 2020 · af0f536 · af0f536
1 parent c51ba03
commit af0f536
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/fsw/cfe-core/src/es/cfe_es_start.c b/fsw/cfe-core/src/es/cfe_es_start.c
@@ -848,13 +848,13 @@ void  CFE_ES_CreateObjects(void)
                                            CFE_ES_ObjectTable[i].ObjectName);
                   }
                   CFE_ES_TaskRecordSetUsed(TaskRecPtr, AppRecPtr->MainTaskId);
-                  TaskRecPtr->AppId = CFE_ES_AppRecordGetID(AppRecPtr);
+                  TaskRecPtr->AppId = PendingAppId;
                   strncpy(TaskRecPtr->TaskName, CFE_ES_ObjectTable[i].ObjectName, sizeof(TaskRecPtr->TaskName)-1);
                   TaskRecPtr->TaskName[sizeof(TaskRecPtr->TaskName)-1] = '\0';
 
                   CFE_ES_SysLogWrite_Unsync("ES Startup: Core App: %s created. App ID: %lu\n",
                                        CFE_ES_ObjectTable[i].ObjectName,
-                                       CFE_ES_ResourceID_ToInteger(CFE_ES_AppRecordGetID(AppRecPtr)));
+                                       CFE_ES_ResourceID_ToInteger(PendingAppId));
 
                   CFE_ES_AppRecordSetUsed(AppRecPtr, PendingAppId);