TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix load_dso error message sometimes being suppressed

Browse Source
This commit is contained in:
rdb 2019-10-05 20:56:58 +02:00
parent 4ceb494127
commit 3a19dfb62e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/display/graphicsPipeSelection.cxx
View File

@ -397,8 +397,9 @@ load_named_module(const string &name) {
<< "loading display module: " << dlname.to_os_specific() << std::endl; << "loading display module: " << dlname.to_os_specific() << std::endl;
void *handle = load_dso(get_plugin_path().get_value(), dlname); void *handle = load_dso(get_plugin_path().get_value(), dlname);
if (handle == nullptr) { if (handle == nullptr) {
std::string error = load_dso_error();
display_cat.warning() display_cat.warning()
<< "Unable to load: " << load_dso_error() << std::endl; << "Unable to load " << dlname.get_basename() << ": " << error << std::endl;
return TypeHandle::none(); return TypeHandle::none();
} }

9
panda/src/movies/movieTypeRegistry.cxx
View File

@ -123,9 +123,10 @@ load_audio_types() {
<< "loading audio type module: " << name << endl; << "loading audio type module: " << name << endl;
void *tmp = load_dso(get_plugin_path().get_value(), dlname); void *tmp = load_dso(get_plugin_path().get_value(), dlname);
if (tmp == nullptr) { if (tmp == nullptr) {
std::string error = load_dso_error();
movies_cat.warning() movies_cat.warning()
<< "Unable to load " << dlname.to_os_specific() << "Unable to load " << dlname.to_os_specific()
<< ": " << load_dso_error() << endl; << ": " << error << endl;
} else if (movies_cat.is_debug()) { } else if (movies_cat.is_debug()) {
movies_cat.debug() movies_cat.debug()
<< "done loading audio type module: " << name << endl; << "done loading audio type module: " << name << endl;
@ -252,9 +253,10 @@ load_video_types() {
<< "loading video type module: " << name << endl; << "loading video type module: " << name << endl;
void *tmp = load_dso(get_plugin_path().get_value(), dlname); void *tmp = load_dso(get_plugin_path().get_value(), dlname);
if (tmp == nullptr) { if (tmp == nullptr) {
std::string error = load_dso_error();
movies_cat.warning() movies_cat.warning()
<< "Unable to load " << dlname.to_os_specific() << "Unable to load " << dlname.to_os_specific()
<< ": " << load_dso_error() << endl; << ": " << error << endl;
} else if (movies_cat.is_debug()) { } else if (movies_cat.is_debug()) {
movies_cat.debug() movies_cat.debug()
<< "done loading video type module: " << name << endl; << "done loading video type module: " << name << endl;
@ -294,9 +296,10 @@ load_movie_library(const string &name) {
void *tmp = load_dso(get_plugin_path().get_value(), dlname); void *tmp = load_dso(get_plugin_path().get_value(), dlname);
if (tmp == nullptr) { if (tmp == nullptr) {
std::string error = load_dso_error();
movies_cat.warning() movies_cat.warning()
<< "Unable to load " << dlname.to_os_specific() << "Unable to load " << dlname.to_os_specific()
<< ": " << load_dso_error() << endl; << ": " << error << endl;
} else if (movies_cat.is_debug()) { } else if (movies_cat.is_debug()) {
movies_cat.debug() movies_cat.debug()
<< "done loading video type module: " << name << endl; << "done loading video type module: " << name << endl;