Merge pull request #2283 from pmzqla/speed-limits

Alternative speed limits changes
This commit is contained in:
sledgehammer999 2014-12-14 16:44:48 +02:00
commit 50492902aa
2 changed files with 10 additions and 8 deletions

View file

@ -572,10 +572,7 @@ void Preferences::setGlobalUploadLimit(int limit) {
}
int Preferences::getAltGlobalDownloadLimit() const {
int ret = value("Preferences/Connection/GlobalDLLimitAlt", 10).toInt();
if (ret <= 0)
ret = 10;
return ret;
return value("Preferences/Connection/GlobalDLLimitAlt", 10).toInt();
}
void Preferences::setAltGlobalDownloadLimit(int limit) {
@ -585,10 +582,7 @@ void Preferences::setAltGlobalDownloadLimit(int limit) {
}
int Preferences::getAltGlobalUploadLimit() const {
int ret = value("Preferences/Connection/GlobalUPLimitAlt", 10).toInt();
if (ret <= 0)
ret = 10;
return ret;
return value("Preferences/Connection/GlobalUPLimitAlt", 10).toInt();
}
void Preferences::setAltGlobalUploadLimit(int limit) {

View file

@ -228,11 +228,15 @@ void StatusBar::capDownloadSpeed() {
QBtSession::instance()->setDownloadRateLimit(-1);
if (!alt)
pref->setGlobalDownloadLimit(-1);
else
pref->setAltGlobalDownloadLimit(-1);
} else {
qDebug("Setting global download rate limit to %.1fKb/s", new_limit/1024.);
QBtSession::instance()->setDownloadRateLimit(new_limit);
if (!alt)
pref->setGlobalDownloadLimit(new_limit/1024.);
else
pref->setAltGlobalDownloadLimit(new_limit/1024.);
}
refreshStatusBar();
}
@ -250,11 +254,15 @@ void StatusBar::capUploadSpeed() {
QBtSession::instance()->setUploadRateLimit(-1);
if (!alt)
Preferences::instance()->setGlobalUploadLimit(-1);
else
Preferences::instance()->setAltGlobalUploadLimit(-1);
} else {
qDebug("Setting global upload rate limit to %.1fKb/s", new_limit/1024.);
QBtSession::instance()->setUploadRateLimit(new_limit);
if (!alt)
Preferences::instance()->setGlobalUploadLimit(new_limit/1024.);
else
Preferences::instance()->setAltGlobalUploadLimit(new_limit/1024.);
}
refreshStatusBar();
}