From 2367c5cf1b2cda62110e80c53439cc95de2be1e6 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Fri, 20 Jan 2023 19:19:44 +0000
Subject: [PATCH] Fix another early return while evaluating text variables.

Fixes https://gitlab.com/kicad/code/kicad/issues/13610
---
 common/drawing_sheet/ds_painter.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/drawing_sheet/ds_painter.cpp b/common/drawing_sheet/ds_painter.cpp
index dc10020416..7369762c2d 100644
--- a/common/drawing_sheet/ds_painter.cpp
+++ b/common/drawing_sheet/ds_painter.cpp
@@ -168,7 +168,8 @@ wxString DS_DRAW_ITEM_LIST::BuildFullText( const wxString& aTextbase )
                 {
                     // no need for tokenUpdated; TITLE_BLOCK::TextVarResolver() does a full
                     // resolve
-                    return m_titleBlock->TextVarResolver( token, m_project );
+                    if( m_titleBlock->TextVarResolver( token, m_project ) )
+                        return true;
                 }
                 else if( m_properties && m_properties->count( *token ) )
                 {