diff options
| author | Kent Mein <mein@cs.umn.edu> | 2008-10-10 21:52:25 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2008-10-10 21:52:25 +0400 |
| commit | 2f9e0ec15453261c7edde8b2fa487c4c17af65de (patch) | |
| tree | 2239bad53cf2b67b4fede15b1796f98158b11d3f /source/blender/blenlib/intern/dynlib.c | |
| parent | d99fd92ffa04b4f6fc7a830b62cb764d9de3f05d (diff) | |
This commit fixes bug: [#17770] Texture Plugins do not work. (on windows)
Thanks to Lguillaume for helping with this one.
Had to go back to bug: [#17631] PIL_dynlib_get_error_as_string() returns NULL, causes crash
and revert the fix and make some new updates.
function needs to return NULL so fix the functions that were assuming it
always returns a string.
Kent
Diffstat (limited to 'source/blender/blenlib/intern/dynlib.c')
| -rw-r--r-- | source/blender/blenlib/intern/dynlib.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/dynlib.c b/source/blender/blenlib/intern/dynlib.c index e7fa3332f43..858aa6e60bf 100644 --- a/source/blender/blenlib/intern/dynlib.c +++ b/source/blender/blenlib/intern/dynlib.c @@ -78,10 +78,7 @@ char *PIL_dynlib_get_error_as_string(PILdynlib* lib) { /* if lib is NULL reset the last error code */ err= GetLastError(); - if (!lib) { - SetLastError(ERROR_SUCCESS); - err = ERROR_SUCCESS; - } + if (!lib) SetLastError(ERROR_SUCCESS); if (err) { static char buf[1024]; @@ -96,7 +93,7 @@ char *PIL_dynlib_get_error_as_string(PILdynlib* lib) { return buf; } - return "unrecognized error"; + return err; } void PIL_dynlib_close(PILdynlib *lib) { |