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

This commit is contained in:
2017-04-19 15:26:30 +00:00
parent 4106e52cd7
commit 0c6200e299
2 changed files with 7 additions and 4 deletions

View File

@@ -89,6 +89,7 @@ bool PIFileTransfer::sendFiles(const PIVector<PFTFileInfo> &files) {
cur_file_string = "";
if (!send_process()) {
sendFilesFinished(false);
started_ = false;
return false;
}
pftheader.step = pft_Data;
@@ -99,6 +100,7 @@ bool PIFileTransfer::sendFiles(const PIVector<PFTFileInfo> &files) {
buildSession(pts);
bool ok = send_process();
sendFilesFinished(ok);
started_ = false;
return ok;
}
@@ -285,16 +287,16 @@ void PIFileTransfer::receive_finished(bool ok) {
}
if (!ok || !user_ok) {
pftheader.session_id--;
started_ = false;
piCoutObj << "file cancel";
receiveFilesFinished(false);
started_ = false;
} else resume();
}
if (pftheader.step == pft_Data) {
//piCoutObj << "file close";
work_file.close();
started_ = false;
receiveFilesFinished(ok);
started_ = false;
}
}
@@ -303,6 +305,5 @@ void PIFileTransfer::send_finished(bool ok) {
// piCoutObj << "file close";
if (pftheader.step == pft_Data) {
work_file.close();
started_ = false;
}
}