git-svn-id: svn://db.shs.com.ru/pip@429 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

This commit is contained in:
2017-04-20 10:24:33 +00:00
parent f9f43df5c1
commit eacda7880e
7 changed files with 46 additions and 19 deletions

View File

@@ -653,6 +653,9 @@ void Daemon::peerDisconnected(const PIString & p_name) {
void Daemon::filesReceived(const PIString & p_name, bool ok) {
piCout << "files received from" << p_name;
// piCout << "try lock in filesReceived, now mutex is" << remote_mutex.isLocked();
// PIMutexLocker ml(remote_mutex);
// piCout << "lock reached";
closeFileDialog(p_name, ok);
Remote * r = remotes.value(p_name, 0);
if (!r) return;
@@ -714,6 +717,7 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
// piCout << "rec" << data.size();
if (data.size() < 4) return;
PIMutexLocker ml(remote_mutex);
// piCout << "lock in dataReceived";
PIByteArray ba(data), rba;
Remote * r = remotes.value(from);
PIString dir;