Fix [52df668390]: Measurement of control characters are wrong after measurement of characters that cannot be displayed by the given font

1 files changed, 4 insertions, 4 deletions

diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index 5ad7753..4c7d1ce 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -2021,16 +2021,16 @@ FindSubFontForChar(
 	ch = 0xFFFD;
     }
 
+    if (FontMapLookup(&fontPtr->controlSubFont, ch)) {
+	return &fontPtr->controlSubFont;
+    }
+
     for (i = 0; i < fontPtr->numSubFonts; i++) {
 	if (FontMapLookup(&fontPtr->subFontArray[i], ch)) {
 	    return &fontPtr->subFontArray[i];
 	}
     }
 
-    if (FontMapLookup(&fontPtr->controlSubFont, ch)) {
-	return &fontPtr->controlSubFont;
-    }
-
     /*
      * Keep track of all face names that we check, so we don't check some name
      * multiple times if it can be reached by multiple paths.