From 388076efc8d6040431a21c34068504ecb01a4dea Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 10 Apr 2009 04:33:31 +0000 Subject: [PATCH] (qt) fix minor bug reported by RolCol: the "ask for more peers" button was enabled for paused torrents if they were being verified --- qt/session.cc | 5 ----- qt/torrent.h | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/qt/session.cc b/qt/session.cc index 3ea348f98..6fc27b1f7 100644 --- a/qt/session.cc +++ b/qt/session.cc @@ -86,7 +86,6 @@ Session :: sessionSet( const char * key, const QVariant& value ) case QVariant::String: tr_bencDictAddStr ( args, key, value.toString().toUtf8() ); break; default: assert( "unknown type" ); } -std::cerr << "request: " << tr_bencToJSON(&top) << std::endl; exec( &top ); tr_bencFree( &top ); } @@ -99,7 +98,6 @@ Session :: portTest( ) tr_bencDictAddStr( &top, "method", "port-test" ); tr_bencDictAddInt( &top, "tag", TAG_PORT_TEST ); exec( &top ); -std::cerr << "request: " << tr_bencToJSON(&top) << std::endl; tr_bencFree( &top ); } @@ -154,12 +152,10 @@ Session :: updatePref( int key ) tr_sessionSetRPCUsername( mySession, myPrefs.getString(key).toUtf8().constData() ); break; case Prefs :: RPC_WHITELIST_ENABLED: -std::cerr << "setting whitelist enabled" << std::endl; if( mySession ) tr_sessionSetRPCWhitelistEnabled( mySession, myPrefs.getBool(key) ); break; case Prefs :: RPC_WHITELIST: -std::cerr << "setting whitelist" << std::endl; if( mySession ) tr_sessionSetRPCWhitelist( mySession, myPrefs.getString(key).toUtf8().constData() ); break; @@ -560,7 +556,6 @@ Session :: parseResponse( const char * json, size_t jsonLength ) } case TAG_PORT_TEST: { -std::cerr << "response: " << json << std::endl; tr_bool isOpen = 0; if( tr_bencDictFindDict( &top, "arguments", &args ) ) tr_bencDictFindBool( args, "port-is-open", &isOpen ); diff --git a/qt/torrent.h b/qt/torrent.h index a3b9d721a..c0674ea4d 100644 --- a/qt/torrent.h +++ b/qt/torrent.h @@ -241,7 +241,7 @@ class Torrent: public QObject QDateTime manualAnnounceTime( ) const { return getDateTime( MANUAL_ANNOUNCE_TIME ); } QDateTime nextAnnounceTime( ) const { return getDateTime( NEXT_ANNOUNCE_TIME ); } QDateTime nextScrapeTime( ) const { return getDateTime( NEXT_SCRAPE_TIME ); } - bool canManualAnnounce( ) const { return !isPaused() && (manualAnnounceTime()<=QDateTime::currentDateTime()); } + bool canManualAnnounce( ) const { return isReadyToTransfer() && (manualAnnounceTime()<=QDateTime::currentDateTime()); } int peersWeAreDownloadingFrom( ) const { return getInt( PEERS_SENDING_TO_US ) + getInt( WEBSEEDS_SENDING_TO_US ); } int peersWeAreUploadingTo( ) const { return getInt( PEERS_GETTING_FROM_US ); } bool isUploading( ) const { return peersWeAreUploadingTo( ) > 0; }