From bffe7dd071e697fa583b1759a9512811f41ac711 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Thu, 25 Nov 2021 10:32:25 +0000
Subject: [PATCH] `DrawStringWithColors`: Fix `{}` support

---
 Source/engine/render/text_render.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Source/engine/render/text_render.cpp b/Source/engine/render/text_render.cpp
index d0dffd5fc..cb18046d9 100644
--- a/Source/engine/render/text_render.cpp
+++ b/Source/engine/render/text_render.cpp
@@ -218,17 +218,19 @@ public:
 		if (rest[0] != '{')
 			return result;
 
-		std::size_t fmtLen;
-		std::size_t closingBracePos;
-		bool positional;
-		if (rest.empty() || (rest[1] != '}' && rest.size() < 3)) {
+		std::size_t closingBracePos = rest.find('}', 1);
+		if (closingBracePos == string_view::npos) {
 			LogError("Unclosed format argument: {}", fmt_);
+			return result;
 		}
-		if (rest[2] == '}' && rest[1] >= '0' && rest[1] <= '9') {
+
+		std::size_t fmtLen;
+		bool positional;
+		if (closingBracePos == 2 && rest[1] >= '0' && rest[1] <= '9') {
 			result = rest[1] - '0';
 			fmtLen = 3;
 			positional = true;
-		} else if ((closingBracePos = rest.find('}', 1)) != string_view::npos) {
+		} else {
 			result = next_++;
 			fmtLen = closingBracePos + 1;
 			positional = false;