From 4fe86652a8d9d3dbcafcf9bdb79b5cd392aad9b2 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Sat, 1 Sep 2007 10:58:03 +0000 Subject: [PATCH] don't declare variables for registry values if they won't be used git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5265 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI 2/Localization.nsh | 14 ++++++++------ Contrib/Modern UI 2/Pages/StartMenu.nsh | 8 +++++++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Contrib/Modern UI 2/Localization.nsh b/Contrib/Modern UI 2/Localization.nsh index 5ab1cdb2..90a21d9f 100644 --- a/Contrib/Modern UI 2/Localization.nsh +++ b/Contrib/Modern UI 2/Localization.nsh @@ -10,12 +10,14 @@ Localization !macro MUI_LANGDLL_VARIABLES - !ifndef MUI_LANGDLL_VARIABLES - !define MUI_LANGDLL_VARIABLES - - ;/GLOBAL because the macros are included in a function - Var /GLOBAL mui.LangDLL.RegistryLanguage - + !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME + !ifndef MUI_LANGDLL_REGISTRY_VARAIBLES + !define MUI_LANGDLL_REGISTRY_VARAIBLES + + ;/GLOBAL because the macros are included in a function + Var /GLOBAL mui.LangDLL.RegistryLanguage + + !endif !endif !macroend diff --git a/Contrib/Modern UI 2/Pages/StartMenu.nsh b/Contrib/Modern UI 2/Pages/StartMenu.nsh index b87962d1..afd7ed49 100644 --- a/Contrib/Modern UI 2/Pages/StartMenu.nsh +++ b/Contrib/Modern UI 2/Pages/StartMenu.nsh @@ -17,10 +17,16 @@ Start Menu folder page Var mui.StartMenuPage.FolderList Var mui.StartMenuPage.Create - Var mui.StartMenuPage.RegistryLocation Var mui.StartMenuPage.ReturnValue !endif + !ifdef MUI_STARTMENUPAGE_REGISTRY_ROOT & MUI_STARTMENUPAGE_REGISTRY_KEY & MUI_STARTMENUPAGE_REGISTRY_VALUENAME + !ifndef MUI_STARTMENUPAGE_REGISTRY_VARIABLES + !define MUI_STARTMENUPAGE_REGISTRY_VARIABLES + Var mui.StartMenuPage.RegistryLocation + !endif + !endif + !macroend