From 230af8c9e97b00bfea43890885301ae2538360df Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Tue, 9 Apr 2013 21:41:51 +0100 Subject: [PATCH] Fix shfolder.dll not getting freed --- code/sys/sys_win32.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/sys/sys_win32.c b/code/sys/sys_win32.c index bbb8ead0..76fea307 100644 --- a/code/sys/sys_win32.c +++ b/code/sys/sys_win32.c @@ -89,15 +89,15 @@ char *Sys_DefaultHomePath( void ) TCHAR szPath[MAX_PATH]; FARPROC qSHGetFolderPath; HMODULE shfolder = LoadLibrary("shfolder.dll"); - + + if(shfolder == NULL) + { + Com_Printf("Unable to load SHFolder.dll\n"); + return NULL; + } + if(!*homePath && com_homepath) { - if(shfolder == NULL) - { - Com_Printf("Unable to load SHFolder.dll\n"); - return NULL; - } - qSHGetFolderPath = GetProcAddress(shfolder, "SHGetFolderPathA"); if(qSHGetFolderPath == NULL) { @@ -120,10 +120,9 @@ char *Sys_DefaultHomePath( void ) Q_strcat(homePath, sizeof(homePath), com_homepath->string); else Q_strcat(homePath, sizeof(homePath), HOMEPATH_NAME_WIN); - - FreeLibrary(shfolder); } + FreeLibrary(shfolder); return homePath; }