From fbca6c178e69d0328ae2fc7ed813f0a771bb11d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 20 Apr 2017 13:25:09 +0000 Subject: [PATCH] release candidate git-svn-id: svn://db.shs.com.ru/pip@453 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- utils/system_daemon/daemon.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/utils/system_daemon/daemon.cpp b/utils/system_daemon/daemon.cpp index a9e95d6f..57452e90 100644 --- a/utils/system_daemon/daemon.cpp +++ b/utils/system_daemon/daemon.cpp @@ -228,8 +228,8 @@ void Daemon::TileFileProgress::close(bool ok) { ft = 0; ::screen->setDialogTile(0); if (!ok) { - piCout << "Achtung! Alarm!! Error!!!"; - showInfo("Error while files transfer..."); + piCout << "file transfer aborted"; + 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) { - 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(); // PIMutexLocker ml(remote_mutex); // 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) { - 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); } @@ -698,7 +700,7 @@ void Daemon::closeFileDialog(const PIString & p_name, bool ok) { fm.updateRemoteDir(); 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; tile_file_progress->close(ok); // if (ok) {