diff -Nur source/SftpControlSocket.cpp source.patch/SftpControlSocket.cpp
old
|
new
|
|
2882 | 2882 | int elapsed=static_cast<int>(timespan.GetTotalSeconds()); |
2883 | 2883 | |
2884 | 2884 | t_ffam_transferstatus *status=new t_ffam_transferstatus; |
2885 | | status->bFileTransfer = TRUE; |
2886 | 2885 | status->timeelapsed=elapsed; |
2887 | 2886 | status->bytes=transferdata.transfersize-transferdata.transferleft; |
2888 | 2887 | if (transferdata.transfersize>0) |
… |
… |
|
2902 | 2901 | if (left < 0) |
2903 | 2902 | left = -1; |
2904 | 2903 | status->timeleft = left; |
| 2904 | status->bFileTransfer=TRUE; |
2905 | 2905 | } |
2906 | 2906 | else |
2907 | 2907 | { |
2908 | 2908 | status->percent=-1; |
2909 | 2909 | status->timeleft=-1; |
| 2910 | status->bFileTransfer=FALSE; |
2910 | 2911 | } |
2911 | 2912 | |
2912 | 2913 | status->transferrate=(elapsed&&(transferdata.transfersize-transferdata.transferleft-transferdata.nTransferStart))? |
diff -Nur source/TransferSocket.cpp source.patch/TransferSocket.cpp
old
|
new
|
|
943 | 943 | int elapsed=(int)timespan.GetTotalSeconds(); |
944 | 944 | |
945 | 945 | t_ffam_transferstatus *status=new t_ffam_transferstatus; |
946 | | status->bFileTransfer=TRUE; |
947 | 946 | status->timeelapsed=elapsed; |
948 | 947 | status->bytes=m_transferdata.transfersize-m_transferdata.transferleft; |
949 | 948 | if (m_transferdata.transfersize>0 && !(m_nMode&CSMODE_LIST)) |
… |
… |
|
967 | 966 | if (left < 0) |
968 | 967 | left = -1; |
969 | 968 | status->timeleft=left; |
| 969 | status->bFileTransfer=TRUE; |
970 | 970 | } |
971 | 971 | else |
972 | 972 | { |
973 | 973 | status->percent=-1; |
974 | 974 | status->timeleft=-1; |
| 975 | status->bFileTransfer=FALSE; |
975 | 976 | } |
976 | 977 | |
977 | 978 | int count = 0; |
… |
… |
|
1366 | 1367 | return -1; |
1367 | 1368 | } |
1368 | 1369 | END_CATCH_ALL; |
1369 | | } |
1370 | | No newline at end of file |
| 1370 | } |