Skip to content

if we set resetTimerAfterFinish to true, we should call it before calling delegate #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liuxuan30 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

if we set resetTimerAfterFinish to true, we should call it before calling delegate #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions MZTimerLabel/MZTimerLabel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,18 +392,23 @@ -(void)updateLabel{

//0.5.1 moved below to the bottom
if(timerEnded) {
// save the timeUserValue because reset will change it
NSTimeInterval endTimeUserValue = timeUserValue;

// call reset before we call delegate
if(_resetTimerAfterFinish){
[self reset];
}

if([_delegate respondsToSelector:@selector(timerLabel:finshedCountDownTimerWithTime:)]){
[_delegate timerLabel:self finshedCountDownTimerWithTime:timeUserValue];
[_delegate timerLabel:self finshedCountDownTimerWithTime:endTimeUserValue];
}

#if NS_BLOCKS_AVAILABLE
if(_endedBlock != nil){
_endedBlock(timeUserValue);
_endedBlock(endTimeUserValue);
}
#endif
if(_resetTimerAfterFinish){
[self reset];
}

}

Expand Down