From 3898243600610487bb809b5e9c661f5d5b11e2a3 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, 9 Apr 2015 08:27:59 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@81 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/io/pibasetransfer.cpp | 6 +++++- utils/system_daemon/daemon.cpp | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/io/pibasetransfer.cpp b/src/io/pibasetransfer.cpp index cc116f3b..1098171c 100644 --- a/src/io/pibasetransfer.cpp +++ b/src/io/pibasetransfer.cpp @@ -195,7 +195,10 @@ bool PIBaseTransfer::send_process() { if (send_queue >= packets_count || is_pause) { --i; 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 (stm.elapsed_s() > timeout_ / 10.) send_queue = 0; @@ -221,6 +224,7 @@ bool PIBaseTransfer::send_process() { } if (is_pause) { piMSleep(10); + sendReply(pt_Pause); if (pause_tm.elapsed_s() > timeout())return finish_send(false); else continue; } diff --git a/utils/system_daemon/daemon.cpp b/utils/system_daemon/daemon.cpp index c974da95..b726d545 100644 --- a/utils/system_daemon/daemon.cpp +++ b/utils/system_daemon/daemon.cpp @@ -45,6 +45,7 @@ Daemon::TileFileProgress::TileFileProgress(): PIScreenTile() { buttons = new TileButtons("fd_buttons"); buttons->content << TileButtons::Button("Pause", 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; label_file->back_format.color_char = label_speed->back_format.color_char = Black; label_file->content.resize(1);