Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PlayerSync/PlayerSync.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Authors></Authors>
<Company></Company>
<Version>1.15.2.6</Version>
<Version>1.15.2.7</Version>
<Description></Description>
<Copyright></Copyright>
<PackageProjectUrl>https://github.com/MareSynchronos/client</PackageProjectUrl>
Expand Down
34 changes: 17 additions & 17 deletions PlayerSync/UI/SettingsUi.Performance.cs
Original file line number Diff line number Diff line change
Expand Up @@ -235,26 +235,26 @@ private void DrawPerformanceThresholdPausing()
ImGui.Text("(thousand triangles)");
_uiShared.DrawHelpText("When a loading in player and their triangle count exceeds this amount, automatically pauses the synced player." + UiSharedService.TooltipSeparator
+ "Default: 250 thousand");
ImGui.SetNextItemWidth(200 * ImGuiHelpers.GlobalScale);
_uiShared.DrawCombo("Auto Pause Duration##autoPauseThreshold", [
PauseDuration.ThirtyMinutes,
}
ImGui.SetNextItemWidth(200 * ImGuiHelpers.GlobalScale);
_uiShared.DrawCombo("Auto Pause Duration##autoPauseThreshold", [
PauseDuration.ThirtyMinutes,
PauseDuration.FourHours,
PauseDuration.EightHours,
PauseDuration.Indefinitely
],
(s) => s switch
{
PauseDuration.ThirtyMinutes => "Pause for 30 minutes",
PauseDuration.FourHours => "Pause for 4 hours",
PauseDuration.EightHours => "Pause for 8 hours",
PauseDuration.Indefinitely => "Indefinitely",
_ => throw new NotSupportedException()
}, (s) =>
{
_playerPerformanceConfigService.Current.PauseDurationAutoPauseExceedingThresholds = s;
_playerPerformanceConfigService.Save();
}, PauseDuration.Indefinitely);
}
],
(s) => s switch
{
PauseDuration.ThirtyMinutes => "Pause for 30 minutes",
PauseDuration.FourHours => "Pause for 4 hours",
PauseDuration.EightHours => "Pause for 8 hours",
PauseDuration.Indefinitely => "Indefinitely",
_ => throw new NotSupportedException()
}, (s) =>
{
_playerPerformanceConfigService.Current.PauseDurationAutoPauseExceedingThresholds = s;
_playerPerformanceConfigService.Save();
}, PauseDuration.Indefinitely);
_uiShared.DrawHelpText("Pairs paused indefinitely require a manual unpause unless unpaused via a Syncshell resume.");

ImGui.Dummy(new Vector2(10));
Expand Down
2 changes: 2 additions & 0 deletions PlayerSync/WebAPI/SignalR/ApiController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,8 @@ public async Task UnPauseAsync(UserData userData, bool notification = false)
if (pair == null)
{
Logger.LogWarning("Called to unpause user but UID does not exist: {uid}", uid);
_serverManager.RemovePauseReasonForUid(uid);
_serverManager.RemovePendingPauseForUid(uid);
return;
}
var perm = pair.UserPair!.OwnPermissions;
Expand Down
Loading