Merge branch 'develop' into poc-6+

ethereum · Oct 5, 2014 · 5cc9348 · 5cc9348
2 parents 0430da9 + 2ed2d47
commit 5cc9348
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/alethzero/DownloadView.cpp b/alethzero/DownloadView.cpp
@@ -63,7 +63,7 @@ void DownloadView::paintEvent(QPaintEvent*)
 			unsigned h = 0;
 			m_man->foreachSub([&](DownloadSub const& sub)
 			{
-				if (sub.asked().contains(i))
+				if (sub.askedContains(i))
 					s = h;
 				h++;
 			});

diff --git a/libethereum/DownloadMan.h b/libethereum/DownloadMan.h
@@ -54,6 +54,7 @@ class DownloadSub
 	/// Nothing doing here.
 	void doneFetch() { resetFetch(); }
 
+	bool askedContains(unsigned _i) const { Guard l(m_fetch); return m_asked.contains(_i); }
 	RangeMask<unsigned> const& asked() const { return m_asked; }
 	RangeMask<unsigned> const& attemped() const { return m_attempted; }
 
@@ -69,7 +70,7 @@ class DownloadSub
 
 	DownloadMan* m_man = nullptr;
 
-	Mutex m_fetch;
+	mutable Mutex m_fetch;
 	h256Set m_remaining;
 	std::map<h256, unsigned> m_indices;
 	RangeMask<unsigned> m_asked;