From 2574e4b2b67ad4df4544fcd25603ba68d3ff1688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Thu, 12 Mar 2015 15:11:27 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@25
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src/io/pipeer.cpp            | 1 -
 src/io/pipeer.h              | 4 ++--
 utils/system_daemon/main.cpp | 6 ++++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/io/pipeer.cpp b/src/io/pipeer.cpp
index 00f5ed9d..5507b9fb 100755
--- a/src/io/pipeer.cpp
+++ b/src/io/pipeer.cpp
@@ -301,7 +301,6 @@ bool PIPeer::dataRead(uchar * readed, int size) {
 					return true;
 				}
 			}
-			return true;
 		}
 		return true;
 	}
diff --git a/src/io/pipeer.h b/src/io/pipeer.h
index d016bb04..17e6541c 100755
--- a/src/io/pipeer.h
+++ b/src/io/pipeer.h
@@ -119,8 +119,8 @@ public:
 	const PeerInfo & selfInfo() const {return self_info;}
 	const PIMap<PIString, PIVector<PeerInfo * > >  & _peerMap() const {return addresses_map;}
 	
-	void lock() {mc_mutex.lock();}
-	void unlock() {mc_mutex.unlock();}
+	void lock() {mc_mutex.lock(); eth_mutex.lock(); peers_mutex.lock();}
+	void unlock() {mc_mutex.unlock(); eth_mutex.unlock(); peers_mutex.unlock();}
 	
 	EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data);
 	EVENT1(peerConnectedEvent, const PIString &, name);
diff --git a/utils/system_daemon/main.cpp b/utils/system_daemon/main.cpp
index 2dc7e6df..410b81e6 100755
--- a/utils/system_daemon/main.cpp
+++ b/utils/system_daemon/main.cpp
@@ -123,6 +123,7 @@ public:
 	}
 	void updatePeerInfo() {
 		screen.lock();
+		daemon_.lock();
 		peers_tl->content.clear();
 		addrs_tl->content.clear();
 		peerinfo_tl->content.clear();
@@ -154,6 +155,7 @@ public:
 		}
 		piForeachC(PIString &s , peermap)
 			peermap_tl->content << TileList::Row(s, CellFormat());
+		daemon_.unlock();
 		screen.unlock();
 	}
     void tick(void* data_, int delimiter) {
@@ -231,13 +233,13 @@ void tabConnect() {
 }
 
 int main(int argc, char * argv[]) {
-	//piDebug = false;
+	piDebug = false;
 	PICLI cli(argc, argv);
 	//cli.addArgument("");
 	sys_mon.startOnSelf();
 	screen.enableExitCapture(PIKbdListener::F10);
 	MainMenu menu;
-	//screen.start();
+	screen.start();
 	screen.waitForFinish();
 	//return 0;
 	/*while (!PIKbdListener::exiting) {