From 9541d2eb2c95e96d14b1fc70c71e53aefdea2040 Mon Sep 17 00:00:00 2001
From: Kurt Hindenburg <kurt.hindenburg@gmail.com>
Date: Sun, 29 May 2022 21:17:04 -0400
Subject: [PATCH] Use unique variable name to avoid shadowing

---
 src/terminalDisplay/TerminalPainter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/terminalDisplay/TerminalPainter.cpp b/src/terminalDisplay/TerminalPainter.cpp
index aefe22c7..f83abc0e 100644
--- a/src/terminalDisplay/TerminalPainter.cpp
+++ b/src/terminalDisplay/TerminalPainter.cpp
@@ -149,8 +149,8 @@ void TerminalPainter::drawContents(Character *image,
                         // univec intentionally not modified - trailing spaces are meaningless
                         len++;
                         while (isInsideDrawArea(x + len)) {
-                            const Character next_char = image[m_parentDisplay->loc(x + len, y)];
-                            if (next_char.character == ' ' && char_value.hasSameColors(next_char) && char_value.hasSameRendition(next_char)) {
+                            const Character next_char_gp = image[m_parentDisplay->loc(x + len, y)];
+                            if (next_char_gp.character == ' ' && char_value.hasSameColors(next_char_gp) && char_value.hasSameRendition(next_char_gp)) {
                                 len++;
                             } else {
                                 break;