Mercurial > hg > vampy
changeset 116:c85d26cb9dab vampy-2.3
Add debug print of Vampy release version; update CHANGELOG
author | Chris Cannam |
---|---|
date | Tue, 26 Feb 2019 14:42:15 +0000 |
parents | a9e918adfff0 |
children | 9333516e6656 |
files | CHANGELOG vampy-main.cpp version.h |
diffstat | 3 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Tue Feb 26 14:31:08 2019 +0000 +++ b/CHANGELOG Tue Feb 26 14:42:15 2019 +0000 @@ -1,3 +1,10 @@ + +UPDATES IN VERSION 2.3: + + * Fix crash when Vampy is loaded and unloaded without querying + any plugins + * Fix a further possible crash with non-loadable plugin modules + UPDATES IN VERSION 2.2:
--- a/vampy-main.cpp Tue Feb 26 14:31:08 2019 +0000 +++ b/vampy-main.cpp Tue Feb 26 14:42:15 2019 +0000 @@ -58,6 +58,8 @@ #include <dlfcn.h> #endif +#include "version.h" + using std::cerr; using std::endl; using std::string; @@ -199,9 +201,11 @@ return; /*HAVE_NUMPY*/ -#endif +#else + DSTREAM << "Numpy support deselected at compile time, not attempting to initialise it" << endl; +#endif - numpyInstalled = false; + numpyInstalled = false; arrayApiInitialised = true; return; } @@ -300,8 +304,10 @@ { DSTREAM << "# vampGetPluginDescriptor(" << version << "," << index << ")" << endl; - if (version < 1) return 0; + if (version < 1) return 0; + DSTREAM << "# Vampy version: " << VAMPY_VERSION << endl; + int isPythonInitialized = Py_IsInitialized(); DSTREAM << "# isPythonInitialized: " << isPythonInitialized << endl; DSTREAM << "# haveScannedPlugins: " << haveScannedPlugins << endl;