From b4f63105e11d8529e5399ff16492c6016e3106ac Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 20 Feb 2004 15:13:13 +0000 Subject: [PATCH] AllowRootDirInstall should now work along with InstallDirRegKey when the specified registry value contains a root directory without a trailing backslash. When writing $INSTDIR as is, this will always be the case. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3494 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/Ui.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index 701d17e0..d280733e 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -228,10 +228,10 @@ __forceinline int NSISCALL ui_doinstall(void) char *e; if (p[0]=='\"') { - char *p2=CharNext(p); - p=p2; - p2 = findchar(p2, '"'); - *p2=0; + char *p2; + p++; + p2 = findchar(p, '"'); + *p2 = 0; } // p is the path now, check for .exe extension @@ -252,7 +252,7 @@ __forceinline int NSISCALL ui_doinstall(void) } } - mystrcpy(state_install_directory,p); + mystrcpy(state_install_directory,addtrailingslash(p)); } } }