@@ -231,7 +231,6 @@ protected override Task OnInitializedAsync()
231231 }
232232
233233 Messenger . Register < StreamerDownloadProgressMessage > ( this , HandleStreamerDownloadProgress ) ;
234- Messenger . Register < DtoReceivedMessage < ClipboardChangeDto > > ( this , HandleClipboardChangeReceived ) ;
235234 Messenger . Register < DtoReceivedMessage < UnsignedPayloadDto > > ( this , HandleUnsignedDtoReceived ) ;
236235 Messenger . RegisterGenericMessage ( this , HandleParameterlessMessage ) ;
237236
@@ -262,6 +261,11 @@ private async Task DrawRegion(ScreenRegionDto dto)
262261 {
263262 try
264263 {
264+ if ( dto . SessionId != Session . SessionId )
265+ {
266+ return ;
267+ }
268+
265269 await JsModule . InvokeVoidAsync (
266270 "drawFrame" ,
267271 _canvasId ,
@@ -277,16 +281,16 @@ await JsModule.InvokeVoidAsync(
277281 }
278282 }
279283
280- private async Task HandleClipboardChangeReceived ( object subscriber , DtoReceivedMessage < ClipboardChangeDto > message )
284+ private async Task HandleClipboardChangeReceived ( ClipboardChangeDto dto )
281285 {
282286 try
283287 {
284- if ( message . Dto . SessionId != Session . SessionId )
288+ if ( dto . SessionId != Session . SessionId )
285289 {
286290 return ;
287291 }
288292 Snackbar . Add ( "Clipboard synced (incoming)" , Severity . Info ) ;
289- await ClipboardManager . SetText ( message . Dto . Text ?? string . Empty ) ;
293+ await ClipboardManager . SetText ( dto . Text ?? string . Empty ) ;
290294 await InvokeAsync ( StateHasChanged ) ;
291295 }
292296 catch ( Exception ex )
@@ -520,14 +524,15 @@ private async Task HandleUnsignedDtoReceived(object subscriber, DtoReceivedMessa
520524 case DtoType . ScreenRegion :
521525 {
522526 var dto = wrapper . GetPayload < ScreenRegionDto > ( ) ;
523- if ( dto . SessionId != Session . SessionId )
524- {
525- return ;
526- }
527-
528527 await DrawRegion ( dto ) ;
529528 break ;
530529 }
530+ case DtoType . ClipboardChanged :
531+ {
532+ var dto = wrapper . GetPayload < ClipboardChangeDto > ( ) ;
533+ await HandleClipboardChangeReceived ( dto ) ;
534+ break ;
535+ }
531536 default :
532537 break ;
533538 }
0 commit comments