X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=python-plugin-provider%2Fpython-plugin-provider.c;h=2404fc7acbdb434064758faa51b88ec2231dd488;hb=7da0994e5743522bbe78c56fd783dd37fcc7bc6d;hp=2cb5a7334f82169b608d557180875e9f619dd3ec;hpb=692cc7b646a796e0ba4e54c12ef60eb5ca7a4284;p=babeltrace.git

diff --git a/python-plugin-provider/python-plugin-provider.c b/python-plugin-provider/python-plugin-provider.c
index 2cb5a733..2404fc7a 100644
--- a/python-plugin-provider/python-plugin-provider.c
+++ b/python-plugin-provider/python-plugin-provider.c
@@ -57,6 +57,7 @@ enum python_state {
 } python_state = PYTHON_STATE_NOT_INITED;
 
 static PyObject *py_try_load_plugin_module_func = NULL;
+static bool python_was_initialized_by_us;
 
 static
 void print_python_traceback_warn(void)
@@ -101,6 +102,7 @@ void init_python(void)
 	if (!Py_IsInitialized()) {
 		BT_LOGI_STR("Python interpreter is not initialized: initializing Python interpreter.");
 		Py_InitializeEx(0);
+		python_was_initialized_by_us = true;
 		BT_LOGI("Initialized Python interpreter: version=\"%s\"",
 			Py_GetVersion());
 	} else {
@@ -138,7 +140,7 @@ end:
 
 __attribute__((destructor)) static
 void fini_python(void) {
-	if (Py_IsInitialized()) {
+	if (Py_IsInitialized() && python_was_initialized_by_us) {
 		if (py_try_load_plugin_module_func) {
 			Py_DECREF(py_try_load_plugin_module_func);
 			py_try_load_plugin_module_func = NULL;