git-svn-id: svn://db.shs.com.ru/pip@429 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user