diff --git a/Plugin/EngageTimer.yaml b/Plugin/EngageTimer.yaml index 4ccde8b..610b46b 100644 --- a/Plugin/EngageTimer.yaml +++ b/Plugin/EngageTimer.yaml @@ -34,3 +34,4 @@ category_tags: - jobs changelog: |- - Hide floating window border by default (you can re-enable it in floating window -> styling) + - Fix not being able to disable alarms \ No newline at end of file diff --git a/Plugin/Status/CombatAlarm.cs b/Plugin/Status/CombatAlarm.cs index b9bd796..c3e59b1 100644 --- a/Plugin/Status/CombatAlarm.cs +++ b/Plugin/Status/CombatAlarm.cs @@ -118,6 +118,7 @@ private void ConfigurationChanged(object? sender, EventArgs e) for (var index = 0; index < Plugin.Config.CombatAlarms.Alarms.Count; index++) { var alarm = Plugin.Config.CombatAlarms.Alarms[index]; + if (!alarm.Enabled) continue; _alarms[alarm.StartTime] = new AlarmAction() { Type = AlarmActionType.Start, @@ -148,7 +149,7 @@ private void FrameworkUpdate(IFramework framework) if (!Plugin.State.InCombat) return; // only run once a second - var time = (int) Math.Floor(Plugin.State.CombatDuration.TotalSeconds); + var time = (int)Math.Floor(Plugin.State.CombatDuration.TotalSeconds); if (_lastCheck == time) return; _lastCheck = time; @@ -167,14 +168,14 @@ public static void AlarmSfx(CombatAlarmsConfiguration.Alarm alarm) { if (alarm.Sfx != null) { - Plugin.SfxPlay.SoundEffect((uint) (SfxPlay.FirstSeSfx + alarm.Sfx)); + Plugin.SfxPlay.SoundEffect((uint)(SfxPlay.FirstSeSfx + alarm.Sfx)); } } public static void AlarmText(CombatAlarmsConfiguration.Alarm alarm) { var trimText = alarm.Text?.Trim(); - if (trimText is not {Length: > 0}) return; + if (trimText is not { Length: > 0 }) return; switch (alarm.TextType) { case CombatAlarmsConfiguration.TextType.DalamudNotification: diff --git a/Plugin/Ui/SettingsTab/AlarmsTab.cs b/Plugin/Ui/SettingsTab/AlarmsTab.cs index 8bc5116..8929246 100644 --- a/Plugin/Ui/SettingsTab/AlarmsTab.cs +++ b/Plugin/Ui/SettingsTab/AlarmsTab.cs @@ -179,7 +179,7 @@ private static void AlarmElement(int index, CombatAlarmsConfiguration.Alarm alar } { ImGui.TableNextColumn(); - ImGui.Checkbox("###enabled" + index, ref alarm.Enabled); + if (ImGui.Checkbox("###enabled" + index, ref alarm.Enabled)) Plugin.Config.Save(); } { ImGui.TableNextColumn(); @@ -211,10 +211,7 @@ private static void AlarmElement(int index, CombatAlarmsConfiguration.Alarm alar } { ImGui.TableNextColumn(); - if (ImGui.Checkbox("###blink", ref alarm.Blink)) - { - Plugin.Config.Save(); - } + if (ImGui.Checkbox("###blink", ref alarm.Blink)) Plugin.Config.Save(); } { ImGui.TableNextColumn(); @@ -248,13 +245,13 @@ private static void AlarmElement(int index, CombatAlarmsConfiguration.Alarm alar ImGui.TableNextColumn(); if (EditingTexts.Contains(index)) { - var type = (int) alarm.TextType; + var type = (int)alarm.TextType; ImGui.PushItemWidth(150f); if (ImGui.Combo("Type", ref type, Strings.AlarmEdit_Type_ChatLog + "\0" + Strings.AlarmEdit_Type_DalamudNotification + "\0" + Strings.AlarmEdit_Type_GameToast + "\0")) { - alarm.TextType = (CombatAlarmsConfiguration.TextType) type; + alarm.TextType = (CombatAlarmsConfiguration.TextType)type; Plugin.Config.Save(); }