diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 20:37:03 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 20:37:03 +0000 |
| commit | 94c682ee504e8ea9e74a051e9b172468f62b1526 (patch) | |
| tree | 3e3f8aeced9626bb9354a7025f42a09f11055665 /chrome/browser/sync | |
| parent | 330f00915320314781e32e634eca5ba1eedf6e41 (diff) | |
| download | chromium_src-94c682ee504e8ea9e74a051e9b172468f62b1526.zip chromium_src-94c682ee504e8ea9e74a051e9b172468f62b1526.tar.gz chromium_src-94c682ee504e8ea9e74a051e9b172468f62b1526.tar.bz2 | |
Fix and resubmit 42959
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1508005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread.cc b/chrome/browser/sync/engine/syncer_thread.cc index 33354d0..4dc3cf8 100644 --- a/chrome/browser/sync/engine/syncer_thread.cc +++ b/chrome/browser/sync/engine/syncer_thread.cc @@ -262,7 +262,7 @@ void SyncerThread::ThreadMainLoop() { // We block until the CV is signaled (e.g a control field changed, loss of // network connection, nudge, spurious, etc), or the poll interval elapses. TimeDelta sleep_time = end_wait - TimeTicks::Now(); - if (sleep_time > TimeDelta::FromSeconds(0)) { + if (!initial_sync_for_thread && sleep_time > TimeDelta::FromSeconds(0)) { vault_field_changed_.TimedWait(sleep_time); if (TimeTicks::Now() < end_wait) { |