┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/views
diff options
context:
space:
mode:
authorSimeon Bird <[email protected]>2013-01-15 11:11:11 -0500
committerSimeon Bird <[email protected]>2013-01-15 11:11:11 -0500
commit72de114a94c9a8d313c517a694be63662a7d10c2 (patch)
tree403f753638f2fdbfbc449e818c3290f81854dcfc /src/views
parent4f0cd0b4470a76f649d8d7017672f47d0cae320d (diff)
parente7fe50bd3d5a2a1f8427878086ff94deb31091bb (diff)
Merge branch 'KDE/4.10'
Diffstat (limited to 'src/views')
-rw-r--r--src/views/versioncontrol/versioncontrolobserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 42e00de42..64bc26867 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -245,7 +245,7 @@ void VersionControlObserver::updateItemStates()
connect(m_updateItemStatesThread, SIGNAL(finished()),
m_updateItemStatesThread, SLOT(deleteLater()));
}
- if (m_updateItemStatesThread->isRunning()) {
+ else {
// An update is currently ongoing. Wait until the thread has finished
// the update (see slotThreadFinished()).
m_pendingItemStatesUpdate = true;