diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-29 00:20:48 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-29 00:20:48 +0000 |
| commit | 7a8475c6da19434a3bae6783279fd9e9ad79fc47 (patch) | |
| tree | 2e174d15792a31dd509c2d748359459ff1a66213 /base | |
| parent | f9624dc2e6e23f762ecd726b9e80290f6424435b (diff) | |
| download | chromium_src-7a8475c6da19434a3bae6783279fd9e9ad79fc47.zip chromium_src-7a8475c6da19434a3bae6783279fd9e9ad79fc47.tar.gz chromium_src-7a8475c6da19434a3bae6783279fd9e9ad79fc47.tar.bz2 | |
fix base_unittets bustage observed on mac/linux
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/timer.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/timer.h b/base/timer.h index 68fcf05..add7844 100644 --- a/base/timer.h +++ b/base/timer.h @@ -326,9 +326,11 @@ class BaseTimer : public BaseTimer_Helper { if (!timer_) // timer_ is null if we were orphaned. return; BaseTimer<Receiver>* self = static_cast<BaseTimer<Receiver>*>(timer_); - self->delayed_task_ = NULL; - if (self->repeating_) + if (self->repeating_) { self->Reset(); + } else { + self->delayed_task_ = NULL; + } DispatchToMethod(self->receiver_, self->receiver_method_, Tuple0()); } }; |