nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always call UserChanged when ChangeCloudSyncStatus

Browse source 
Don't clear the LastSessionUserName
It should only be used in the name field of the login screen and nowhere else.
This commit is contained in:
Lars Brubaker 2016-10-21 17:09:53 -07:00
parent f7352284f9
commit 95fc69e7f8
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ApplicationView/MainApplicationWidget.cs
View file

@ -521,15 +521,14 @@ namespace MatterHackers.MatterControl
CloudSyncStatusChanged.CallEvents(this, new CloudSyncEventArgs() { IsAuthenticated = userAuthenticated });
// Only fire UserChanged if it actually happened - prevents runaway positive feedback loop
if (AuthenticationData.Instance.ActiveSessionUsername != AuthenticationData.Instance.LastSessionUsername)
if (!string.IsNullOrEmpty(AuthenticationData.Instance.ActiveSessionUsername)
&& AuthenticationData.Instance.ActiveSessionUsername != AuthenticationData.Instance.LastSessionUsername)
{
// only set it if it is an actual user name
if (!string.IsNullOrEmpty(AuthenticationData.Instance.ActiveSessionUsername))
{
AuthenticationData.Instance.LastSessionUsername = AuthenticationData.Instance.ActiveSessionUsername;
}
UserChanged();
AuthenticationData.Instance.LastSessionUsername = AuthenticationData.Instance.ActiveSessionUsername;
}
UserChanged();
}
// Called after every startup and at the completion of every authentication change

2
PartPreviewWindow/ViewGcodeWidget.cs
View file

@ -356,7 +356,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
//using (new PerformanceTimer("GCode Timer", "Render"))
{
gCodeRenderer.Render(graphics2D, renderInfo);
gCodeRenderer?.Render(graphics2D, renderInfo);
}
}
}

1
Utilities/AuthenticationData.cs
View file

@ -64,7 +64,6 @@ namespace MatterHackers.MatterControl
this.ActiveSessionUsername = null;
this.ActiveSessionEmail = null;
this.ActiveClientToken = null;
this.LastSessionUsername = null;
ApplicationController.Instance.ChangeCloudSyncStatus(userAuthenticated: false, reason: "Session Cleared".Localize());
SessionUpdateTrigger.CallEvents(null, null);