better error reporting

use lock count instead of message queuing to avoid py->py messaging deadlock
must clear Python error...

svn path=/trunk/; revision=2585

1 files changed, 4 insertions, 3 deletions

diff --git a/externals/grill/py/source/pyargs.cpp b/externals/grill/py/source/pyargs.cpp
index aee12a17..a040feac 100644
--- a/externals/grill/py/source/pyargs.cpp
+++ b/externals/grill/py/source/pyargs.cpp
@@ -14,17 +14,18 @@ static PyObject *MakePyAtom(const t_atom &at)
 {
 	if(flext::IsSymbol(at)) 
         return pySymbol_FromSymbol(flext::GetSymbol(at));
-//	else if(flext::IsPointer(at)) return NULL; // not handled
-    else if(flext::CanbeInt(at) && flext::CanbeFloat(at)) {
+    else if(flext::CanbeInt(at) || flext::CanbeFloat(at)) {
         // if a number can be an integer... let at be an integer!
         int ival = flext::GetAInt(at);
         double fval = flext::GetAFloat(at);
         return (double)ival == fval?PyInt_FromLong(ival):PyFloat_FromDouble(fval);
     }
+//	else if(flext::IsPointer(at)) return NULL; // not handled
+/*
     // these following should never happen
     else if(flext::IsFloat(at)) return PyFloat_FromDouble((double)flext::GetFloat(at));
 	else if(flext::IsInt(at)) return PyInt_FromLong(flext::GetInt(at));
-  
+*/  
     return NULL;
 }