NsisIn.h (p7zip_15.14.1_src_all) | : | NsisIn.h (p7zip_16.02_src_all) | ||
---|---|---|---|---|
skipping to change at line 419 | skipping to change at line 419 | |||
} | } | |||
else | else | |||
{ | { | |||
s += MultiByteToUnicodeString(item.NameA); | s += MultiByteToUnicodeString(item.NameA); | |||
if (item.NameA.IsEmpty()) | if (item.NameA.IsEmpty()) | |||
s += L"file"; | s += L"file"; | |||
} | } | |||
const char *kRemoveStr = "$INSTDIR\\"; | const char *kRemoveStr = "$INSTDIR\\"; | |||
if (s.IsPrefixedBy_Ascii_NoCase(kRemoveStr)) | if (s.IsPrefixedBy_Ascii_NoCase(kRemoveStr)) | |||
{ | ||||
s.Delete(0, MyStringLen(kRemoveStr)); | s.Delete(0, MyStringLen(kRemoveStr)); | |||
if (s[0] == L'\\') | ||||
s.DeleteFrontal(1); | ||||
} | ||||
if (item.IsUninstaller && ExeStub.Size() == 0) | if (item.IsUninstaller && ExeStub.Size() == 0) | |||
s += L".nsis"; | s += L".nsis"; | |||
return s; | return s; | |||
} | } | |||
UString ConvertToUnicode(const AString &s) const; | UString ConvertToUnicode(const AString &s) const; | |||
CInArchive() | CInArchive() | |||
#ifdef NSIS_SCRIPT | #ifdef NSIS_SCRIPT | |||
: Script(kScriptSizeLimit) | : Script(kScriptSizeLimit) | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added |