epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix \r\n-style line endings not being properly handled for script errors

Browse Source
This commit is contained in:
abcdefg30
2023-05-20 13:18:18 +02:00
committed by Matthias Mailänder
parent bc5e7d1497
commit 49c837e7d0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Widgets/Logic/Ingame/ScriptErrorLogic.cs
View File

@@ -26,7 +26,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var luaScript = world.WorldActor.TraitOrDefault<LuaScript>(); var luaScript = world.WorldActor.TraitOrDefault<LuaScript>();
if (luaScript != null) if (luaScript != null)
{ {
var text = WidgetUtils.WrapText(luaScript.Context.ErrorMessage, label.Bounds.Width, font); // Native exceptions have OS-dependend line endings, so strip these away as WrapText doesn't handle them
var errorMessage = luaScript.Context.ErrorMessage.Replace("\r\n", "\n");
var text = WidgetUtils.WrapText(errorMessage, label.Bounds.Width, font);
label.Text = text; label.Text = text;
label.Bounds.Height = font.Measure(text).Y; label.Bounds.Height = font.Measure(text).Y;
panel.ScrollToTop(); panel.ScrollToTop();