Skip to content
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

Null check #20643

Open
wants to merge 3 commits into
base: v4
Choose a base branch
from
Open

Null check #20643

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c708925
null check for _animatedScrollAction
zoxin Sep 12, 2017
26f9fc3
Merge remote-tracking branch 'remotes/origin/code_fix' into null_check
zoxin Jan 31, 2021
46da1d5
* null check for _animatedScrollAction
zoxin Jan 31, 2021
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
18 changes: 10 additions & 8 deletions extensions/GUI/CCScrollView/CCScrollView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,9 @@ void ScrollView::setContentOffset(Vec2 offset, bool animated/* = false*/)
void ScrollView::setContentOffsetInDuration(Vec2 offset, float dt)
{
FiniteTimeAction *scroll, *expire;

if (_animatedScrollAction) {
stopAnimatedContentOffset();
}

stopAnimatedContentOffset();

scroll = MoveTo::create(dt, offset);
expire = CallFuncN::create(CC_CALLBACK_1(ScrollView::stoppedAnimatedScroll,this));
_animatedScrollAction = _container->runAction(Sequence::create(scroll, expire, nullptr));
Expand All @@ -256,10 +255,13 @@ void ScrollView::setContentOffsetInDuration(Vec2 offset, float dt)
}

void ScrollView::stopAnimatedContentOffset() {
stopAction(_animatedScrollAction);
_animatedScrollAction->release();
_animatedScrollAction = nullptr;
stoppedAnimatedScroll(this);
if (_animatedScrollAction)
{
stopAction(_animatedScrollAction);
_animatedScrollAction->release();
_animatedScrollAction = nullptr;
stoppedAnimatedScroll(this);
}
}

Vec2 ScrollView::getContentOffset()
Expand Down