Browse Source

- Fixed ipv4 compilation warning with latest g++

- Paused torrents that are checking are now displayed as paused (not checking) -> less confusing
- Updated TODO (libtorrent fixed ipfilter bug)
adaptive-webui-19844
Christophe Dumez 18 years ago
parent
commit
676f30d9a1
  1. 1
      TODO
  2. 2
      src/GUI.cpp
  3. 2
      src/options_imp.cpp

1
TODO

@ -45,6 +45,5 @@
- Optimize and cleanup code - Optimize and cleanup code
- Wait for some bug fixes in libtorrent : - Wait for some bug fixes in libtorrent :
- upload/download limit per torrent - upload/download limit per torrent
- ipfilter crash
- double free or corruption on exit - double free or corruption on exit
- Crash due to connection_queue - Crash due to connection_queue

2
src/GUI.cpp

@ -611,9 +611,11 @@ void GUI::updateDlList(bool force){
continue; continue;
case torrent_status::checking_files: case torrent_status::checking_files:
case torrent_status::queued_for_checking: case torrent_status::queued_for_checking:
if(BTSession->getTorrentsToPauseAfterChecking().indexOf(fileHash) == -1){
DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(":/Icons/skin/connecting.png")), Qt::DecorationRole); DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(":/Icons/skin/connecting.png")), Qt::DecorationRole);
setRowColor(row, "grey"); setRowColor(row, "grey");
DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress)); DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress));
}
break; break;
case torrent_status::connecting_to_tracker: case torrent_status::connecting_to_tracker:
if(torrentStatus.download_payload_rate > 0){ if(torrentStatus.download_payload_rate > 0){

2
src/options_imp.cpp

@ -1083,7 +1083,7 @@ void options_imp::on_addFilterRange_clicked(){
"0.0.0.0", &ok); "0.0.0.0", &ok);
QStringList IP1 = startIP.split('.'); QStringList IP1 = startIP.split('.');
// Check IP // Check IP
bool ipv4; bool ipv4 = true;
QRegExp is_ipv6("^[0-9a-f]{4}(:[0-9a-f]{4}){7}$", Qt::CaseInsensitive, QRegExp::RegExp); QRegExp is_ipv6("^[0-9a-f]{4}(:[0-9a-f]{4}){7}$", Qt::CaseInsensitive, QRegExp::RegExp);
QRegExp is_ipv4("^(([0-1]?[0-9]?[0-9])|(2[0-4][0-9])|(25[0-5]))(\\.(([0-1]?[0-9]?[0-9])|(2[0-4][0-9])|(25[0-5]))){3}$", Qt::CaseInsensitive, QRegExp::RegExp); QRegExp is_ipv4("^(([0-1]?[0-9]?[0-9])|(2[0-4][0-9])|(25[0-5]))(\\.(([0-1]?[0-9]?[0-9])|(2[0-4][0-9])|(25[0-5]))){3}$", Qt::CaseInsensitive, QRegExp::RegExp);

Loading…
Cancel
Save