r20432 by craig -

[scribus-commit]

Author: craig
Date: Mon Sep 28 20:31:50 2015
New Revision: 20432

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20432
Log:
#13376: Python error cleared too early <JurajF>

Modified:
    trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20432&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp	Mon Sep 28 20:31:50 2015
@@ -333,8 +333,6 @@
 		// other return value (most likely None anyway) and can ignore it.
 		if (result == NULL)
 		{
-			// We've already saved the exception text, so clear the exception
-			PyErr_Clear();
 			PyObject* errorMsgPyStr = PyMapping_GetItemString(globals, (char*)"_errorMsg");
 			if (errorMsgPyStr == NULL)
 			{
@@ -360,6 +358,8 @@
 									+ tr("This message is in your clipboard too. Use Ctrl+V to paste it into bug tracker.")
 									+ "</p></qt>");
 			}
+			// We've already processed the exception text, so clear the exception
+			PyErr_Clear();
 		} // end if result == NULL
 		// Because 'result' may be NULL, not a PyObject*, we must call PyXDECREF not Py_DECREF
 		Py_XDECREF(result);