- Removed rc2 from version

Changelog

@@ -1,10 +1,3 @@
-* Sun Aug 21 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.1
-    - BUGFIX: Fix problems when changing save path (if using temporary download folder)
-    - BUGFIX: Display real save path instead of the temporary one in torrent properties
-    - BUGFIX: Catching invalid_handle exception to avoid rare crashes
-    - BUGFIX: Fixed popup menu position in RSS feeds list
-    - BUGFIX: Don't save RSS feed state if it could not be updated
-
 * Thu Aug 13 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.0
     - FEATURE: Display swarm information in lists
     - FEATURE: Allow to define temporary download folder

src/FinishedTorrents.cpp

@@ -267,7 +267,6 @@ void FinishedTorrents::on_actionSet_upload_limit_triggered(){
 }
 
 void FinishedTorrents::updateTorrent(QTorrentHandle h) {
-    if(!h.is_valid()) return;
     QString hash = h.hash();
     int row = getRowFromHash(hash);
     if(row == -1){

src/GUI.cpp

@@ -1420,7 +1420,6 @@ void GUI::updateLists(bool force) {
         for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
             QTorrentHandle h = QTorrentHandle(*torrentIT);
             if(!h.is_valid()) continue;
-            try {
             if(h.is_seed()) {
                 // Update in finished list
                 finishedTorrentTab->updateTorrent(h);
@@ -1432,7 +1431,6 @@ void GUI::updateLists(bool force) {
                     QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+h.hash()+".finished");
                 }
             }
-            } catch(invalid_handle) {}
         }
     }
     if(displaySpeedInTitle) {

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P
-Comment=V1.4.1
+Comment=V1.4.0
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент

src/bittorrent.cpp

@@ -151,10 +151,6 @@ void bittorrent::setDownloadLimit(QString hash, long val) {
   saveTorrentSpeedLimits(hash);
 }
 
-bool bittorrent::useTemporaryFolder() const {
-  return !defaultTempPath.isEmpty();
-}
-
 bool bittorrent::isQueueingEnabled() const {
   return queueingEnabled;
 }

src/bittorrent.h

@@ -77,6 +77,9 @@ class bittorrent : public QObject {
     bool queueingEnabled;
     QStringList url_skippingDlg;
 
+  protected:
+    QString getSavePath(QString hash);
+
   public:
     // Constructor / Destructor
     bittorrent();
@@ -104,8 +107,6 @@ class bittorrent : public QObject {
     QStringList getConsoleMessages() const;
     QStringList getPeerBanMessages() const;
     qlonglong getETA(QString hash) const;
-    bool useTemporaryFolder() const;
-    QString getSavePath(QString hash);
 
   public slots:
     QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);

src/downloadingTorrents.cpp

@@ -482,7 +482,6 @@ QStringList DownloadingTorrents::getSelectedTorrents(bool only_one) const{
 // get information from torrent handles and
 // update download list accordingly
 bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
-    if(!h.is_valid()) return false;
     bool added = false;
     try{
       QString hash = h.hash();

src/properties_imp.cpp

@@ -86,7 +86,7 @@ properties::properties(QWidget *parent, bittorrent *BTSession, QTorrentHandle &h
   // get Infos from torrent handle
   fileName->setText(h.name());
   // Torrent Infos
-  save_path->setText(BTSession->getSavePath(hash));
+  save_path->setText(h.save_path());
   QString author = h.creator().trimmed();
   if(author.isEmpty())
     author = tr("Unknown");
@@ -711,7 +711,6 @@ void properties::on_changeSavePathButton_clicked() {
         savepath_file.write(savePath.path().toLocal8Bit());
         savepath_file.close();
         // Actually move storage
-        if(!BTSession->useTemporaryFolder() || h.is_seed())
         h.move_storage(savePath.path());
         // Update save_path in dialog
         save_path->setText(savePath.path());

src/rss.h

@@ -329,10 +329,8 @@ class RssStream : public QObject{
     }
 
     ~RssStream(){
-      if(refreshed) {
       QSettings qBTRSS("qBittorrent-rss");
       qBTRSS.setValue(url, getAllReadHashes());
-      }
       removeAllItems();
       if(QFile::exists(filePath))
         QFile::remove(filePath);

src/rss_imp.cpp

@@ -54,7 +54,7 @@
         myFinishedListMenu.addAction(actionCreate);
         myFinishedListMenu.addAction(actionRefreshAll);
       }
-      myFinishedListMenu.exec(QCursor::pos());
+      myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,33));
     }
 
     // add a stream by a button

src/src.pro

@@ -14,10 +14,10 @@ CONFIG += qt \
     network
 
 # Update this VERSION for each release
-DEFINES += VERSION=\\\"v1.4.1\\\"
+DEFINES += VERSION=\\\"v1.4.0\\\"
 DEFINES += VERSION_MAJOR=1
 DEFINES += VERSION_MINOR=4
-DEFINES += VERSION_BUGFIX=1
+DEFINES += VERSION_BUGFIX=0
 !mac:QMAKE_LFLAGS += -Wl,--as-needed
 contains(DEBUG_MODE, 1) { 
     CONFIG += debug