From 676f30d9a19eeb40630cadb4e8e9d5cfb72e3184 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Thu, 26 Jul 2007 15:43:27 +0000 Subject: [PATCH] - 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) --- TODO | 1 - src/GUI.cpp | 8 +++++--- src/options_imp.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/TODO b/TODO index 46d2511a4..73c4415f1 100644 --- a/TODO +++ b/TODO @@ -45,6 +45,5 @@ - Optimize and cleanup code - Wait for some bug fixes in libtorrent : - upload/download limit per torrent - - ipfilter crash - double free or corruption on exit - Crash due to connection_queue \ No newline at end of file diff --git a/src/GUI.cpp b/src/GUI.cpp index 33c6807b1..e8762a6d7 100644 --- a/src/GUI.cpp +++ b/src/GUI.cpp @@ -611,9 +611,11 @@ void GUI::updateDlList(bool force){ continue; case torrent_status::checking_files: case torrent_status::queued_for_checking: - DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(":/Icons/skin/connecting.png")), Qt::DecorationRole); - setRowColor(row, "grey"); - DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress)); + if(BTSession->getTorrentsToPauseAfterChecking().indexOf(fileHash) == -1){ + DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(":/Icons/skin/connecting.png")), Qt::DecorationRole); + setRowColor(row, "grey"); + DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress)); + } break; case torrent_status::connecting_to_tracker: if(torrentStatus.download_payload_rate > 0){ diff --git a/src/options_imp.cpp b/src/options_imp.cpp index 527f4da2c..68032a100 100644 --- a/src/options_imp.cpp +++ b/src/options_imp.cpp @@ -1083,7 +1083,7 @@ void options_imp::on_addFilterRange_clicked(){ "0.0.0.0", &ok); QStringList IP1 = startIP.split('.'); // 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_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);