archive/blender-cloud-addon
Archived
1
3
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed race condition referring to self when operator may have stopped running

Browse Source 
The `file_loading` function is called deferred by asyncio, and can thus
be called when the operator has already stopped loading. This is fixed by
not referring to `self` in that function, and taking the logger from the
outer scope.
This commit is contained in:
Sybren A. Stüvel 2019-01-03 11:32:31 +01:00
parent 974d33e3a3
commit ff9ae0117d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
blender_cloud/texture_browser/__init__.py
View File

@ -707,18 +707,19 @@ class PILLAR_OT_switch_hdri(pillar.PillarOperatorMixin,
resolution = next(file_ref['resolution'] for file_ref in node['properties']['files'] resolution = next(file_ref['resolution'] for file_ref in node['properties']['files']
if file_ref['file'] == file_uuid) if file_ref['file'] == file_uuid)
self.log.info('Downloading file %r-%s to %s', file_uuid, resolution, local_path) my_log = self.log
self.log.debug('Metadata will be stored at %s', meta_path) my_log.info('Downloading file %r-%s to %s', file_uuid, resolution, local_path)
my_log.debug('Metadata will be stored at %s', meta_path)
def file_loading(file_path, file_desc, map_type): def file_loading(file_path, file_desc, map_type):
self.log.info('Texture downloading to %s (%s)', my_log.info('Texture downloading to %s (%s)',
file_path, utils.sizeof_fmt(file_desc['length'])) file_path, utils.sizeof_fmt(file_desc['length']))
async def file_loaded(file_path, file_desc, map_type): async def file_loaded(file_path, file_desc, map_type):
if context.scene.local_texture_dir.startswith('//'): if context.scene.local_texture_dir.startswith('//'):
file_path = bpy.path.relpath(file_path) file_path = bpy.path.relpath(file_path)
self.log.info('Texture downloaded to %s', file_path) my_log.info('Texture downloaded to %s', file_path)
current_image['bcloud_file_uuid'] = file_uuid current_image['bcloud_file_uuid'] = file_uuid
current_image.filepath = file_path # This automatically reloads the image from disk. current_image.filepath = file_path # This automatically reloads the image from disk.