Set the current directory back to the exe dir
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1880 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
53d954e00b
commit
1fd1ebd07e
1 changed files with 2 additions and 1 deletions
|
@ -938,7 +938,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
|
||||||
char *buf1=process_string_fromparm_tobuf(0x11);
|
char *buf1=process_string_fromparm_tobuf(0x11);
|
||||||
|
|
||||||
// suggested by Kevin Gadd (janusfury)
|
// suggested by Kevin Gadd (janusfury)
|
||||||
lstrcpy(buf3, buf0);
|
mystrcpy(buf3, buf0);
|
||||||
trimslashtoend(buf3);
|
trimslashtoend(buf3);
|
||||||
SetCurrentDirectory(buf3);
|
SetCurrentDirectory(buf3);
|
||||||
|
|
||||||
|
@ -980,6 +980,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
|
||||||
update_status_text_from_lang(LANG_COULDNOTLOAD,buf0);
|
update_status_text_from_lang(LANG_COULDNOTLOAD,buf0);
|
||||||
log_printf2("Error registering DLL: Could not load %s",buf0);
|
log_printf2("Error registering DLL: Could not load %s",buf0);
|
||||||
}
|
}
|
||||||
|
SetCurrentDirectory(state_exe_directory);
|
||||||
OleUninitialize();
|
OleUninitialize();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue