From d487c5f0dd59afeeeaf752f2f014a05531666727 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 18 Nov 2003 22:35:51 +0000
Subject: [PATCH] Font goes in $(^Font), font size goes in $(^FontSize)...

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3165 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/lang.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/lang.cpp b/Source/lang.cpp
index 9c11488f..a9d4b571 100644
--- a/Source/lang.cpp
+++ b/Source/lang.cpp
@@ -616,6 +616,15 @@ void CEXEBuild::FillLanguageTable(LanguageTable *table) {
             continue;
           }
           else if (i == NLF_FONT)
+          {
+            char *font = *build_font ? build_font : table->nlf.m_szFont;
+            if (font)
+              table->lang_strings->set(sn, font);
+            else
+              table->lang_strings->set(sn, dstr);
+            continue;
+          }
+          else if (i == NLF_FONTSIZE)
           {
             int font_size = *build_font ? build_font_size : table->nlf.m_iFontSize;
             if (font_size)
@@ -628,15 +637,6 @@ void CEXEBuild::FillLanguageTable(LanguageTable *table) {
               table->lang_strings->set(sn, dstr);
             continue;
           }
-          else if (i == NLF_FONTSIZE)
-          {
-            char *font = *build_font ? build_font : table->nlf.m_szFont;
-            if (font)
-              table->lang_strings->set(sn, font);
-            else
-              table->lang_strings->set(sn, dstr);
-            continue;
-          }
           table->lang_strings->set(sn, dstr);
         }
       }