Merge branch 'master' into trace_recording

This commit is contained in:
Trevor Blackwell
2016-09-07 19:41:46 -07:00
6 changed files with 122 additions and 22 deletions

View File

@@ -204,7 +204,8 @@ class Monitor(object):
logger.error('Could not close renderer for %s: %s', key, e)
# Remove the env's pointer to this monitor
del env._monitor
if hasattr(env, '_monitor'):
del env._monitor
# Stop tracking this for autoclose
monitor_closer.unregister(self._monitor_id)