From 35e1cf7b864b789822e86d64a6cc042e9bc74476 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 17 Aug 2007 16:20:26 +0000 Subject: [PATCH] better solution - don't old functions and not shfolder but still try to get all user's version from the os (though tests show it will return current user's version anyway) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5238 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/exehead/util.c b/Source/exehead/util.c index 5ff96a48..ec06caef 100644 --- a/Source/exehead/util.c +++ b/Source/exehead/util.c @@ -635,7 +635,7 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab) (fldrs[2] != CSIDL_COMMON_APPDATA) // not all users's appdata ); - if (g_exec_flags.all_user_var && all_users_9x_capable) + if (g_exec_flags.all_user_var) { x = 4; } @@ -660,7 +660,7 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab) while (x--) { - if (g_SHGetFolderPath) + if (g_SHGetFolderPath && all_users_9x_capable) { PFNSHGETFOLDERPATHA SHGetFolderPathFunc = (PFNSHGETFOLDERPATHA) g_SHGetFolderPath; if (!SHGetFolderPathFunc(g_hwnd, fldrs[x], NULL, SHGFP_TYPE_CURRENT, out))