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

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();

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;
 				}

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();

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) {

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;