diff --git a/multi_user/libs/replication b/multi_user/libs/replication index 850456a..0c28554 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit 850456a004683db8dc811f5cd7c0d2dee580cc4a +Subproject commit 0c285547192ca31cd98ab1e6cc9b887d8a0d4ec9 diff --git a/multi_user/operators.py b/multi_user/operators.py index 5d779c2..3858579 100644 --- a/multi_user/operators.py +++ b/multi_user/operators.py @@ -103,33 +103,23 @@ class SessionStartOperator(bpy.types.Operator): except TimeoutExpired: pass - client.connect( - id=settings.username, - address=settings.ip, - port=settings.port, - ttl_port=settings.ttl_port - ) - settings.is_admin = True else: utils.clean_scene() + try: client.connect( id=settings.username, address=settings.ip, port=settings.port, ttl_port=settings.ttl_port ) + except Exception as e: + self.report({'ERROR'}, repr(e)) + logger.error(f"Error: {e}") - time.sleep(1) - - if client.state == 0: - settings.is_admin = False - self.report( - {'ERROR'}, - "A session is already hosted on this address") - return {"CANCELLED"} - + time.sleep(1) # Removed as soon as server will be launched from replication + if self.host: for scene in bpy.data.scenes: scene_uuid = client.add(scene)