diff --git a/Source/build.cpp b/Source/build.cpp index b063ab25..8d300dc9 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -409,7 +409,7 @@ int CEXEBuild::add_string(const char *string, int process/*=1*/) // returns offs { if (!*string) return 0; - if (process && *string == '$' && *(string+1) == '(') { + if (*string == '$' && *(string+1) == '(') { int idx = 0; char *cp = strdup(string+2); char *p = strchr(cp, ')'); diff --git a/Source/script.cpp b/Source/script.cpp index 83f86db6..58b9fc73 100644 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -1449,12 +1449,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) } return make_sure_not_in_secorfunc(line.gettoken_str(0), 1); case TOK_LICENSEDATA: -#ifdef NSIS_CONFIG_SILENT_SUPPORT - if (build_header.flags&(CH_FLAGS_SILENT|CH_FLAGS_SILENT_LOG)) - { - warning_fl("LicenseData: SilentInstall enabled, wasting space"); - } -#endif { int idx = 0; char *file = line.gettoken_str(1); @@ -1466,18 +1460,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) char *p = strchr(cp, ')'); if (p && p[1] == 0) { // if string is only a language str identifier *p = 0; - if (!uninstall_mode && !strnicmp(cp,"un.",3)) - { - ERROR_MSG("Installer language strings can't start with un. (%s)! (%s:%d)", cp, curfilename, linecnt); - free(cp); - return PS_ERROR; - } - else if (uninstall_mode && strnicmp(cp,"un.",3)) - { - ERROR_MSG("Uninstaller language strings must start with un. (%s)! (%s:%d)", cp, curfilename, linecnt); - free(cp); - return PS_ERROR; - } idx = DefineLangString(cp, 0); } free(cp);