From d1bf889e712620b220b6d4fb68f6693c4a3903a4 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <seth@kipro-pcb.com>
Date: Fri, 21 Oct 2022 08:36:27 -0700
Subject: [PATCH] Resolve embedded text vars

Title Block text variables are embedded into the pcb file and should
be used for resolving when the project file is missing
---
 common/title_block.cpp | 8 +++++++-
 pcbnew/board.cpp       | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/title_block.cpp b/common/title_block.cpp
index 00d33954d4..f5fc324ccf 100644
--- a/common/title_block.cpp
+++ b/common/title_block.cpp
@@ -95,6 +95,7 @@ void TITLE_BLOCK::GetContextualTextVars( wxArrayString* aVars )
 bool TITLE_BLOCK::TextVarResolver( wxString* aToken, const PROJECT* aProject ) const
 {
     bool tokenUpdated = false;
+    wxString originalToken = *aToken;
 
     if( aToken->IsSameAs( wxT( "ISSUE_DATE" ) ) )
     {
@@ -150,7 +151,12 @@ bool TITLE_BLOCK::TextVarResolver( wxString* aToken, const PROJECT* aProject ) c
 
     if( tokenUpdated )
     {
-       *aToken = ExpandTextVars( *aToken, aProject );
+        *aToken = ExpandTextVars( *aToken, aProject );
+
+        // This is the default fallback, so don't claim we resolved it
+        if( *aToken == wxT( "${" ) + originalToken + wxT( "}" ) )
+            return false;
+
        return true;
     }
 
diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp
index 1378fd09e0..d08fde54cf 100644
--- a/pcbnew/board.cpp
+++ b/pcbnew/board.cpp
@@ -298,13 +298,15 @@ std::vector<PCB_MARKER*> BOARD::ResolveDRCExclusions()
 
 bool BOARD::ResolveTextVar( wxString* token, int aDepth ) const
 {
+    wxString var = *token;
+
     if( GetTitleBlock().TextVarResolver( token, m_project ) )
     {
         return true;
     }
-    else if( m_properties.count( *token ) )
+    else if( m_properties.count( var ) )
     {
-        *token = m_properties.at( *token );
+        *token = m_properties.at( var );
         return true;
     }