From ba4036e290af32aa5c357abfef6632c08d520fff Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 19 Jan 2019 23:12:46 +0100 Subject: [PATCH] prc: clear error flag if loading deploy-ng blobinfo fails --- dtool/src/prc/configPageManager.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dtool/src/prc/configPageManager.cxx b/dtool/src/prc/configPageManager.cxx index 72e00f0189..b26eb17c69 100644 --- a/dtool/src/prc/configPageManager.cxx +++ b/dtool/src/prc/configPageManager.cxx @@ -129,7 +129,12 @@ reload_implicit_pages() { #else const BlobInfo *blobinfo = (const BlobInfo *)dlsym(dlopen(NULL, RTLD_NOW), "blobinfo"); #endif - if (blobinfo != nullptr && (blobinfo->version == 0 || blobinfo->num_pointers < 10)) { + if (blobinfo == nullptr) { +#ifndef _MSC_VER + // Clear the error flag. + dlerror(); +#endif + } else if (blobinfo->version == 0 || blobinfo->num_pointers < 10) { blobinfo = nullptr; }