michele/sledgemapper
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 4 Wiki Activity

more broken code
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Michele 2021-09-05 22:07:34 +01:00
parent ef2ad6965b
commit 1395d93fbc
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Sledgemapper/UI/MainWidget.Custom.cs
View file

@ -1,4 +1,5 @@
using Exceptionless; using Exceptionless;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Myra.Graphics2D.Brushes; using Myra.Graphics2D.Brushes;
using Myra.Graphics2D.UI; using Myra.Graphics2D.UI;
@ -285,17 +286,17 @@ namespace Sledgemapper.UI
return; return;
} }
if (_communicationManager.Connection.State != HubConnectionState.Connected) if (CommunicationManager.Connection.State != HubConnectionState.Connected)
{ {
_mainWidget.lblConnectionStatus.Text = "Connecting"; _mainWidget.lblConnectionStatus.Text = "Connecting";
await _communicationManager.Connection.StartAsync(); await CommunicationManager.Connection.StartAsync();
UpdateConnectionState(_communicationManager.Connection); UpdateConnectionState(CommunicationManager.Connection);
} }
var successful = false; var successful = false;
try try
{ {
var result = await _communicationManager.Api.NewSession(_state.CampaignName, localContent.Content.TxtSession.Text); var result = await CommunicationManager.Api.NewSession(_state.CampaignName, localContent.Content.TxtSession.Text);
if (result) if (result)
{ {
@ -306,7 +307,7 @@ namespace Sledgemapper.UI
_sessionData.MapEntityDeleted += OnMapEntityDeleted; _sessionData.MapEntityDeleted += OnMapEntityDeleted;
} }
successful = result; successful = result;
var result2 = await _communicationManager.Connection?.InvokeAsync<Session>("JoinSession", localContent.Content.TxtSession.Text); var result2 = await CommunicationManager.Connection?.InvokeAsync<Session>("JoinSession", localContent.Content.TxtSession.Text);
_sessionData.SessionId = result2.SessionId; _sessionData.SessionId = result2.SessionId;
_sessionData.SessionName = localContent.Content.TxtSession.Text; _sessionData.SessionName = localContent.Content.TxtSession.Text;
} }
@ -318,12 +319,12 @@ namespace Sledgemapper.UI
if (successful) if (successful)
{ {
_sessionData.SessionName = localContent.Content.TxtSession.Text; _sessionData.SessionName = localContent.Content.TxtSession.Text;
_communicationManager.SessionData.Map = _sessionData.Map; CommunicationManager.SessionData.Map = _sessionData.Map;
_communicationManager.SessionData.Overlays = _sessionData.Overlays; CommunicationManager.SessionData.Overlays = _sessionData.Overlays;
_communicationManager.SessionData.Walls = _sessionData.Walls; CommunicationManager.SessionData.Walls = _sessionData.Walls;
_mainWidget.lblSessionName.Text = _sessionData.SessionName; lblSessionName.Text = _sessionData.SessionName;
_mainWidget.MenuConnectSync.Enabled = true; MenuConnectSync.Enabled = true;
_mainWidget.MenuConnectUpload.Enabled = true; MenuConnectUpload.Enabled = true;
localContent.Window.Close(); localContent.Window.Close();
} }
} }