pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-07-02 10:38:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/main' into fix/devtools-fixex

Browse source
This commit is contained in:
Neil Dorin 2026-05-10 20:48:10 -06:00
commit 6fbdaa9ca0
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs
View file

@ -107,11 +107,11 @@ namespace PepperDash.Core.WebApi.Presets
var user = JsonConvert.DeserializeObject<User>(resp.ContentString); var user = JsonConvert.DeserializeObject<User>(resp.ContentString);
CurrentUser = user; CurrentUser = user;
if (handler != null) if (handler != null)
UserReceived(this, new UserReceivedEventArgs(user, true)); handler(this, new UserReceivedEventArgs(user, true));
} }
else else
if (handler != null) if (handler != null)
UserReceived(this, new UserReceivedEventArgs(null, false)); handler(this, new UserReceivedEventArgs(null, false));
} }
/// <summary> /// <summary>
@ -171,14 +171,14 @@ namespace PepperDash.Core.WebApi.Presets
J2SMaster.LoadWithJson(preset.Data); J2SMaster.LoadWithJson(preset.Data);
if (handler != null) if (handler != null)
PresetReceived(this, new PresetReceivedEventArgs(preset, true)); handler(this, new PresetReceivedEventArgs(preset, true));
} }
else // no existing preset else // no existing preset
{ {
CurrentPreset = new Preset(); CurrentPreset = new Preset();
LoadDefaultPresetData(); LoadDefaultPresetData();
if (handler != null) if (handler != null)
PresetReceived(this, new PresetReceivedEventArgs(null, false)); handler(this, new PresetReceivedEventArgs(null, false));
} }
} }
catch (HttpException e) catch (HttpException e)

2
src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs
View file

@ -150,7 +150,7 @@ namespace PepperDash.Essentials.Core.Config
// Directory exists, first clear any contents // Directory exists, first clear any contents
var archivedConfigFiles = ConfigReader.GetConfigFiles(archiveDirectoryPath + Global.DirectorySeparator + Global.ConfigFileName + ".bak"); var archivedConfigFiles = ConfigReader.GetConfigFiles(archiveDirectoryPath + Global.DirectorySeparator + Global.ConfigFileName + ".bak");
if (archivedConfigFiles != null || archivedConfigFiles.Length > 0) if (archivedConfigFiles != null && archivedConfigFiles.Length > 0)
{ {
Debug.LogMessage(LogEventLevel.Information, "{0} Existing files found in archive folder. Deleting.", archivedConfigFiles.Length); Debug.LogMessage(LogEventLevel.Information, "{0} Existing files found in archive folder. Deleting.", archivedConfigFiles.Length);