From e493a6b1469c1a2d0f54f2190b6344d68666cd9f 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?= <andrey@signalmodelling.ru>
Date: Thu, 20 Apr 2017 11:01:32 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@430
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 main.cpp                       | 15 ++++++++-------
 src_main/io/pidir.cpp          |  4 ++--
 src_main/io/pifiletransfer.cpp |  2 +-
 utils/system_daemon/daemon.cpp |  7 +++++--
 utils/system_daemon/main.cpp   |  1 +
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/main.cpp b/main.cpp
index 58d7b3a4..92d0c99a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,17 +39,18 @@ int asize(ssize_t s, size_t pid_rsize) {
 	while (s_ >> t) ++t;
 	return (1 << t);
 }
+
 int main(int argc, char *argv[]) {
-	PIMutex m;
-	m.lock();
-	m.unlock();
-	m.lock();
-	m.unlock();
-	m.lock();
+//	PIMutex m;
+//	m.lock();
+//	m.unlock();
+//	m.lock();
+//	m.unlock();
 //	m.lock();
 //	m.lock();
 //	m.lock();
-	piCout << "finish" << m.isLocked();
+//	m.lock();
+//	piCout << "finish" << m.isLocked();
 
 //	PIDiagnostics d;
 //	piCout << d.receiveBytesPerSec();
diff --git a/src_main/io/pidir.cpp b/src_main/io/pidir.cpp
index 648ae2a0..a17af532 100755
--- a/src_main/io/pidir.cpp
+++ b/src_main/io/pidir.cpp
@@ -195,11 +195,11 @@ bool PIDir::make(bool withParents) {
 				tp = separator;
 				if (!is_abs) tp.push_front('.');
 			}
-			piCout << tp;
+			//piCout << tp;
 			if (isExists(tp)) {
 				for (int j = i + 1; j <= l.size_s(); ++j) {
 					tp = PIStringList(l).remove(j, l.size_s() - j).join(separator);
-					piCout << tp;
+					//piCout << tp;
 					if (makeDir(tp)) continue;
 					else return false;
 				}
diff --git a/src_main/io/pifiletransfer.cpp b/src_main/io/pifiletransfer.cpp
index 8928ffa4..ec549aee 100644
--- a/src_main/io/pifiletransfer.cpp
+++ b/src_main/io/pifiletransfer.cpp
@@ -296,7 +296,7 @@ void PIFileTransfer::receive_finished(bool ok) {
 		}
 		if (!ok || !user_ok) {
 			pftheader.session_id--;
-			piCoutObj << "file cancel";
+			piCoutObj << "receive aborted";
 			receiveFilesFinished(false);
 			started_ = false;
 		} else resume();
diff --git a/utils/system_daemon/daemon.cpp b/utils/system_daemon/daemon.cpp
index 0c2ec1aa..a9e95d6f 100644
--- a/utils/system_daemon/daemon.cpp
+++ b/utils/system_daemon/daemon.cpp
@@ -247,7 +247,10 @@ void Daemon::TileFileProgress::tileEvent(PIScreenTile * t, TileEvent e) {
 				ft->resume();
 			}
 			break;
-		case 1: ft->stop(); close(); break;
+		case 1:
+			ft->stop();
+			close();
+			break;
 		};
 	}
 }
@@ -695,7 +698,7 @@ void Daemon::closeFileDialog(const PIString & p_name, bool ok) {
 		fm.updateRemoteDir();
 		return;
 	}
-	piCoutObj << "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) {
diff --git a/utils/system_daemon/main.cpp b/utils/system_daemon/main.cpp
index 95e389ba..ca2d5b43 100755
--- a/utils/system_daemon/main.cpp
+++ b/utils/system_daemon/main.cpp
@@ -352,6 +352,7 @@ int main(int argc, char * argv[]) {
 	if (sapp) CONNECTU(sapp, messageReceived, menu, messageFromApp)
 	screen->start();
 	screen->waitForFinish();
+	screen->stop(true);
 	delete menu;
 	delete daemon;
 	delete screen;