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

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

Browse Source
This commit is contained in:
Бычков Андрей
2015-04-09 08:27:59 +00:00
parent 42afbb11b7
commit 3898243600
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/io/pibasetransfer.cpp
View File

@@ -195,7 +195,10 @@ bool PIBaseTransfer::send_process() {
if (send_queue >= packets_count || is_pause) { if (send_queue >= packets_count || is_pause) {
--i; --i;
piMSleep(1); piMSleep(1);
if (is_pause && pause_tm.elapsed_s() > timeout())return finish_send(false); if (is_pause) {
sendReply(pt_Pause);
if (pause_tm.elapsed_s() > timeout())return finish_send(false);
}
if (send_tm.elapsed_s() > timeout_) return finish_send(false); if (send_tm.elapsed_s() > timeout_) return finish_send(false);
if (stm.elapsed_s() > timeout_ / 10.) if (stm.elapsed_s() > timeout_ / 10.)
send_queue = 0; send_queue = 0;
@@ -221,6 +224,7 @@ bool PIBaseTransfer::send_process() {
} }
if (is_pause) { if (is_pause) {
piMSleep(10); piMSleep(10);
sendReply(pt_Pause);
if (pause_tm.elapsed_s() > timeout())return finish_send(false); if (pause_tm.elapsed_s() > timeout())return finish_send(false);
else continue; else continue;
} }

1
utils/system_daemon/daemon.cpp
View File

@@ -45,6 +45,7 @@ Daemon::TileFileProgress::TileFileProgress(): PIScreenTile() {
buttons = new TileButtons("fd_buttons"); buttons = new TileButtons("fd_buttons");
buttons->content << TileButtons::Button("Pause", CellFormat()); buttons->content << TileButtons::Button("Pause", CellFormat());
buttons->content << TileButtons::Button("Cancel", CellFormat()); buttons->content << TileButtons::Button("Cancel", CellFormat());
buttons->content << TileButtons::Button("Pause", CellFormat());
buttons->back_format.color_back = label_file->back_format.color_back = label_speed->back_format.color_back = Yellow; buttons->back_format.color_back = label_file->back_format.color_back = label_speed->back_format.color_back = Yellow;
label_file->back_format.color_char = label_speed->back_format.color_char = Black; label_file->back_format.color_char = label_speed->back_format.color_char = Black;
label_file->content.resize(1); label_file->content.resize(1);