------------------------------------------------------------
revno: 3246
committer: poy <p...@123gen.com>
branch nick: trunk
timestamp: Sat 2013-03-30 17:30:12 +0100
message:
transfers
modified:
win32/TransferView.cpp
--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'win32/TransferView.cpp'
--- win32/TransferView.cpp 2013-03-30 15:55:28 +0000
+++ win32/TransferView.cpp 2013-03-30 16:30:12 +0000
@@ -208,8 +208,11 @@
}
}
+ if(ui.updateMask & UpdateInfo::MASK_SPEED) {
+ speed = std::max(ui.speed, 0LL); // sometimes the speed is negative; avoid problems.
+ }
+
if((ui.updateMask & UpdateInfo::MASK_STATUS) || (ui.updateMask & UpdateInfo::MASK_SPEED)) {
- speed = std::max(ui.speed, 0LL); // sometimes the speed is negative; avoid problems.
if(status == STATUS_RUNNING && speed > 0) {
columns[COLUMN_SPEED] = str(TF_("%1%/s") % Text::toT(Util::formatBytes(speed)));
} else {
@@ -250,8 +253,6 @@
}
void TransferView::ConnectionInfo::force() {
- columns[COLUMN_STATUS] = T_("Connecting (forced)");
- parent.update();
ConnectionManager::getInstance()->force(user);
}
@@ -445,9 +446,7 @@
}
void TransferView::handleForce() {
- HoldRedraw hold { transfers };
transfers->forEachSelected(&ItemInfo::force);
- transfers->resort();
}
void TransferView::handleDisconnect() {
@@ -960,7 +959,6 @@
ui->setStatus(ConnectionInfo::STATUS_WAITING);
ui->setStatusString(T_("Idle"));
ui->setTransferred(t->getPos(), t->getActual(), t->getSize());
- ui->setSpeed(0);
updatedConn(ui);
}
@@ -970,7 +968,6 @@
ui->setFile(d->getPath());
ui->setStatus(ConnectionInfo::STATUS_WAITING);
ui->setStatusString(Text::toT(aReason));
- ui->setSpeed(0);
updatedConn(ui);
}
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
