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
This commit is contained in:
parent
575b9ae83f
commit
d487c5f0dd
1 changed files with 9 additions and 9 deletions
|
@ -616,6 +616,15 @@ void CEXEBuild::FillLanguageTable(LanguageTable *table) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
else if (i == NLF_FONT)
|
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;
|
int font_size = *build_font ? build_font_size : table->nlf.m_iFontSize;
|
||||||
if (font_size)
|
if (font_size)
|
||||||
|
@ -628,15 +637,6 @@ void CEXEBuild::FillLanguageTable(LanguageTable *table) {
|
||||||
table->lang_strings->set(sn, dstr);
|
table->lang_strings->set(sn, dstr);
|
||||||
continue;
|
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);
|
table->lang_strings->set(sn, dstr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue