SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

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

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-19 16:49:38 +00:00
parent 06a9c2197c
commit d8b8487dd7
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/system_daemon/daemon.cpp
View File

@@ -623,8 +623,8 @@ void Daemon::peerConnected(const PIString & p_name) {
// piCout << r->methodsEH() << this->methodsEH();
CONNECTU(r, sendRequest, this, sendRequest)
CONNECTU(r, receiveFinished, this, filesReceived)
CONNECTU(r, receiveFinished, this, closeFileDialog)
CONNECTU(r, sendFinished, this, closeFileDialog)
//CONNECTU(r, receiveFinished, this, closeFileDialog)
CONNECTU(r, sendFinished, this, filesSended)
CONNECTU(r, changeDirFinished, this, dirChanged)
PIMutexLocker ml2(remote_mutex);
remotes.insert(p_name, r);
@@ -650,6 +650,8 @@ void Daemon::peerDisconnected(const PIString & p_name) {
void Daemon::filesReceived(const PIString & p_name, bool ok) {
piCoutObj << "filesReceived";
closeFileDialog(p_name, ok);
PIMutexLocker ml(remote_mutex);
Remote * r = remotes.value(p_name, 0);
if (!r) return;
@@ -657,6 +659,12 @@ void Daemon::filesReceived(const PIString & p_name, bool ok) {
}
void Daemon::filesSended(const PIString & p_name, bool ok) {
piCoutObj << "filesSended";
closeFileDialog(p_name, ok);
}
void Daemon::dirChanged(const PIString & p_name, const PIString & dir) {
if (p_name == self_name) {
fm.clearSelectionLocal();