Merge branch 'master' into Numpy_2_adaptations

Author: photoniker

Qitom/python/pythonEngine.cpp

@@ -6770,12 +6770,16 @@ ito::RetVal PythonEngine::pickleSingleParam(QString filename, QSharedPointer<ito
 
             PyDict_Clear(exportDict);
             Py_DECREF(exportDict);
-            exportDict = NULL;
-
+            exportDict = nullptr;
+            Py_XDECREF(item);
+            PyGILState_Release(gstate);
+        }
+        else
+        {
+            PyGILState_STATE gstate = PyGILState_Ensure();
+            Py_XDECREF(item);
             PyGILState_Release(gstate);
         }
-
-        Py_XDECREF(item);
 
         if (oldState & pyStateIdle)
         {

Qitom/ui/dialogSnapshot.cpp

@@ -549,6 +549,10 @@ void DialogSnapshot::acquisitionEnd()
                         checkRetval(retval);
                         break;
                     }
+                    else if (locker->returnValue != ito::retOk)
+                    {
+                        checkRetval(locker->returnValue);
+                    }
                 }
             }
         }