Skip to content
This repository has been archived by the owner on Aug 8, 2024. It is now read-only.

fix: Race condition NPE for timer overlay #676

Open
wants to merge 6 commits into
base: development
Choose a base branch
from
Open

fix: Race condition NPE for timer overlay #676

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7025355
fix: Race condition NPE for timer overlay
ryanzhoudev May 6, 2023
af75098
refactor: use existing method
ryanzhoudev May 6, 2023
b9c9907
fix: extract to variable
ryanzhoudev May 16, 2023
0215784
Merge branch 'development' into npefix
ryanzhoudev May 16, 2023
c5b1127
Merge branch 'development' into npefix
DevScyu Sep 13, 2023
0e2934c
Merge branch 'development' into npefix
ryanzhoudev Sep 15, 2023
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
7 changes: 5 additions & 2 deletions src/main/java/com/wynntils/modules/utilities/overlays/hud/ConsumableTimerOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,16 @@ public static void addDynamicTimer(String name, int initialTimeSeconds, boolean
*/
public static void addStaticTimer(String prefix, String name, String displayedTime, boolean persistent) {
// If a DynamicTimerContainer or StaticTimerContainer already exists, get rid of it
activeTimers.remove(findTimerContainer(name));
removeTimer(name);

activeTimers.add(new StaticTimerContainer(prefix, name, displayedTime, persistent));
}

public static void removeTimer(String name) {
activeTimers.remove(findTimerContainer(name));
TimerContainer timerContainer = findTimerContainer(name);
if (timerContainer != null) {
activeTimers.remove(timerContainer);
}
}

@Override
Expand Down
Loading