Skip to content

Commit

Permalink
Merge branch 'fiendish-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
nickgammon committed Jan 7, 2015
2 parents e11435c + 9bf5138 commit 7d44a4f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc.cpp
Expand Up @@ -2622,8 +2622,8 @@ void CMUSHclientDoc::ExecuteTriggerScript (CTrigger * trigger_item,
return;

CString strType = "trigger";
CString strReason = TFormat ("processing trigger \"%s\"",
(LPCTSTR) trigger_item->strLabel);
CString strReason = TFormat ("processing trigger \"%s\" when matching line: \"%s\"",
(LPCTSTR) trigger_item->strLabel, (LPCTSTR) strCurrentLine);

// get unlabelled trigger's internal name
const char * pLabel = trigger_item->strLabel;
Expand Down

0 comments on commit 7d44a4f

Please sign in to comment.