Merge pull request #125 from Unity-Technologies/UNI-24799-try-catch-around-import

UNI-24799 add try/finally around import

Author: inwoods

Assets/Integrations/Autodesk/maya/scripts/unityOneClick/commands.py

@@ -198,18 +198,23 @@ def doIt(self, args):
         self._tempName = None
         self._origItemsInScene = []
 
-        callbackId = OpenMaya.MSceneMessage.addCheckFileCallback(OpenMaya.MSceneMessage.kBeforeImportCheck, self.beforeImport)
-        callbackId2 = OpenMaya.MSceneMessage.addCallback(OpenMaya.MSceneMessage.kAfterImport, self.afterImport)
-
-        strCmd = 'Import'
-        self.displayDebug('doIt {0}'.format(strCmd))
-        maya.cmds.Import()
-
-        OpenMaya.MMessage.removeCallback(callbackId)
-        OpenMaya.MMessage.removeCallback(callbackId2)
-        
-        if currWorkspace:
-            maya.cmds.workspace(currWorkspace, o=True)
+        callbackId = None
+        callbackId2 = None
+        try:
+            callbackId = OpenMaya.MSceneMessage.addCheckFileCallback(OpenMaya.MSceneMessage.kBeforeImportCheck, self.beforeImport)
+            callbackId2 = OpenMaya.MSceneMessage.addCallback(OpenMaya.MSceneMessage.kAfterImport, self.afterImport)
+
+            strCmd = 'Import'
+            self.displayDebug('doIt {0}'.format(strCmd))
+            maya.cmds.Import()
+        finally:
+            if currWorkspace:
+                maya.cmds.workspace(currWorkspace, o=True)
+                
+            if callbackId:
+                OpenMaya.MMessage.removeCallback(callbackId)
+            if callbackId2:
+                OpenMaya.MMessage.removeCallback(callbackId2)
 
     @classmethod
     def invoke(cls):