Removed "Error at line 0" in errors before the first line is read.

AutoHotkey · May 3, 2021 · f822897 · f822897
1 parent f0acb8a
commit f822897
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/source/script.cpp b/source/script.cpp
@@ -16701,8 +16701,11 @@ ResultType Script::ScriptError(LPCTSTR aErrorText, LPCTSTR aExtraInfo) //, Resul
 		TCHAR buf[MSGBOX_TEXT_SIZE], *cp = buf;
 		int buf_space_remaining = (int)_countof(buf);
 
-		cp += sntprintf(cp, buf_space_remaining, _T("Error at line %u"), mCombinedLineNumber); // Don't call it "critical" because it's usually a syntax error.
-		buf_space_remaining = (int)(_countof(buf) - (cp - buf));
+		if (mCombinedLineNumber || mCurrFileIndex)
+		{
+			cp += sntprintf(cp, buf_space_remaining, _T("Error at line %u"), mCombinedLineNumber); // Don't call it "critical" because it's usually a syntax error.
+			buf_space_remaining = (int)(_countof(buf) - (cp - buf));
+		}
 
 		if (mCurrFileIndex)
 		{
@@ -16711,8 +16714,11 @@ ResultType Script::ScriptError(LPCTSTR aErrorText, LPCTSTR aExtraInfo) //, Resul
 		}
 		//else don't bother cluttering the display if it's the main script file.
 
-		cp += sntprintf(cp, buf_space_remaining, _T(".\n\n"));
-		buf_space_remaining = (int)(_countof(buf) - (cp - buf));
+		if (mCombinedLineNumber || mCurrFileIndex)
+		{
+			cp += sntprintf(cp, buf_space_remaining, _T(".\n\n"));
+			buf_space_remaining = (int)(_countof(buf) - (cp - buf));
+		}
 
 		if (*aExtraInfo)
 		{