Merge branch 'main' into feature-join-whiteboard-by-code
# Conflicts: # dotnet/AipsRT/Hubs/WhiteboardHub.cs # dotnet/AipsRT/Services/Interfaces/IMessagingService.cs # front/src/stores/whiteboard.ts
This commit is contained in:
@@ -31,7 +31,7 @@ public class WhiteboardHub : Hub
|
||||
{
|
||||
if (!_whiteboardManager.WhiteboardExists(whiteboardId))
|
||||
{
|
||||
await _whiteboardManager.AddWhiteboard(whiteboardId);
|
||||
await _whiteboardManager.LoadWhiteboard(whiteboardId);
|
||||
}
|
||||
|
||||
await Groups.AddToGroupAsync(Context.ConnectionId, whiteboardId.ToString());
|
||||
@@ -210,6 +210,6 @@ public class WhiteboardHub : Hub
|
||||
|
||||
await MoveShape(moveShape);
|
||||
|
||||
await _messagingService.MoveShape(moveShape);
|
||||
await _messagingService.MoveShape(CurrentWhiteboard.WhiteboardId, moveShape);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user