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

release candidate

Browse Source 
git-svn-id: svn://db.shs.com.ru/pip@453 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
Бычков Андрей
2017-04-20 13:25:09 +00:00
parent 89e23017e4
commit fbca6c178e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/system_daemon/daemon.cpp
View File

@@ -228,8 +228,8 @@ void Daemon::TileFileProgress::close(bool ok) {
ft = 0; ft = 0;
::screen->setDialogTile(0); ::screen->setDialogTile(0);
if (!ok) { if (!ok) {
piCout << "Achtung! Alarm!! Error!!!"; piCout << "file transfer aborted";
showInfo("Error while files transfer..."); showInfo("Error while file transfer, files may be invalid");
} }
} }
@@ -655,7 +655,8 @@ void Daemon::peerDisconnected(const PIString & p_name) {
void Daemon::filesReceived(const PIString & p_name, bool ok) { void Daemon::filesReceived(const PIString & p_name, bool ok) {
piCout << "files received from" << p_name; if (ok) piCout << "files received from" << p_name;
else piCout << "warning, files not received from" << p_name;
// piCout << "try lock in filesReceived, now mutex is" << remote_mutex.isLocked(); // piCout << "try lock in filesReceived, now mutex is" << remote_mutex.isLocked();
// PIMutexLocker ml(remote_mutex); // PIMutexLocker ml(remote_mutex);
// piCout << "lock reached"; // piCout << "lock reached";
@@ -667,7 +668,8 @@ void Daemon::filesReceived(const PIString & p_name, bool ok) {
void Daemon::filesSended(const PIString & p_name, bool ok) { void Daemon::filesSended(const PIString & p_name, bool ok) {
piCout << "files sended to" << p_name; if (ok) piCout << "files sended to" << p_name;
else piCout << "warning, files not sended to" << p_name;
closeFileDialog(p_name, ok); closeFileDialog(p_name, ok);
} }
@@ -698,7 +700,7 @@ void Daemon::closeFileDialog(const PIString & p_name, bool ok) {
fm.updateRemoteDir(); fm.updateRemoteDir();
return; return;
} }
piCout << "file transfer with" << p_name << (ok ? "success" : "failure"); //piCout << "file transfer with" << p_name << (ok ? "success" : "failure");
if (tile_file_progress->conn_name != p_name) return; if (tile_file_progress->conn_name != p_name) return;
tile_file_progress->close(ok); tile_file_progress->close(ok);
// if (ok) { // if (ok) {