Report internal name of a trigger on a script error

nickgammon · nickgammon · commit 054190d2e92d · 2019-04-23T09:33:14.000+10:00
diff --git a/ProcessPreviousLine.cpp b/ProcessPreviousLine.cpp
@@ -1152,7 +1152,7 @@ POSITION pos;
       m_iTriggersMatchedCount++;
       m_iTriggersMatchedThisSessionCount++;
       
-      CString strScriptSource = TFormat ("Trigger: %s", (LPCTSTR) trigger_item->strLabel);
+      CString strScriptSource = TFormat ("Trigger: %s", (LPCTSTR) trigger_item->strInternalName);
 
       if (trigger_item->iSendTo == eSendToScriptAfterOmit)
         {
diff --git a/dialogs/world_prefs/genpropertypage.cpp b/dialogs/world_prefs/genpropertypage.cpp
@@ -508,6 +508,8 @@ CString strMsg;
       m_ctlList->SetItemData (nItem, (DWORD) pstrObjectName);
     }   // end of label changing
 
+  SetInternalName (pItem, strObjectName);  // set internal name
+
   // see if the user changed anything, anyway
   if (CheckIfChanged (&dlg, pItem))
     {

Original file line number	Diff line number	Diff line change
`@@ -1152,7 +1152,7 @@ POSITION pos;`
`1152`	`1152`	`m_iTriggersMatchedCount++;`
`1153`	`1153`	`m_iTriggersMatchedThisSessionCount++;`
`1154`	`1154`
`1155`		`- CString strScriptSource = TFormat ("Trigger: %s", (LPCTSTR) trigger_item->strLabel);`
	`1155`	`+ CString strScriptSource = TFormat ("Trigger: %s", (LPCTSTR) trigger_item->strInternalName);`
`1156`	`1156`
`1157`	`1157`	`if (trigger_item->iSendTo == eSendToScriptAfterOmit)`
`1158`	`1158`	`{`
Original file line number	Diff line number	Diff line change
`@@ -508,6 +508,8 @@ CString strMsg;`
`508`	`508`	`m_ctlList->SetItemData (nItem, (DWORD) pstrObjectName);`
`509`	`509`	`} // end of label changing`
`510`	`510`
	`511`	`+ SetInternalName (pItem, strObjectName); // set internal name`
	`512`	`+`
`511`	`513`	`// see if the user changed anything, anyway`
`512`	`514`	`if (CheckIfChanged (&dlg, pItem))`
`513`	`515`	`{`