Mercurial > hg > easyhg
comparison src/mainwindow.cpp @ 549:06f7ae09015f
Fix error that caused fs watcher to be updated during operations
author | Chris Cannam |
---|---|
date | Wed, 15 Feb 2012 14:34:35 +0000 |
parents | 4edb47f8c3a3 |
children | c2207b729ab0 |
comparison
equal
deleted
inserted
replaced
548:dca5bd5b2a06 | 549:06f7ae09015f |
---|---|
1829 if (!m_commandSequenceInProgress) { | 1829 if (!m_commandSequenceInProgress) { |
1830 if (!m_fsWatcher->getChangedPaths(m_fsWatcherToken).empty()) { | 1830 if (!m_fsWatcher->getChangedPaths(m_fsWatcherToken).empty()) { |
1831 hgRefresh(); | 1831 hgRefresh(); |
1832 return; | 1832 return; |
1833 } | 1833 } |
1834 } | 1834 updateFsWatcher(); |
1835 updateFsWatcher(); | 1835 } |
1836 } | 1836 } |
1837 | 1837 |
1838 QString MainWindow::format1(QString head) | 1838 QString MainWindow::format1(QString head) |
1839 { | 1839 { |
1840 return QString("<qt><h3>%1</h3></qt>").arg(head); | 1840 return QString("<qt><h3>%1</h3></qt>").arg(head); |