Changeset 9261 for trunk/qt/mainwin.cc

Timestamp:

Oct 10, 2009, 12:39:38 AM (13 years ago)

Author:

charles

Message:

(trunk Qt) #2298: qtr client crashes when expired torrent is removed

File:

• trunk/qt/mainwin.cc (modified) (2 diffs)

trunk/qt/mainwin.cc

@@ -719 +719 @@
                                       .arg( Utils :: sizeToString( stats.uploadedBytes ) );
     }
-    else /* default is "total-ratio" */
+    else // default is "total-ratio"
     {
         str = tr( "Ratio: %1" ).arg( Utils :: ratioToString( mySession.getCumulativeStats().ratio ) );
@@ -738 +738 @@
     const int rowCount( model->rowCount( ) );
 
-    /* count how many torrents are selected, paused, etc */
+    // count how many torrents are selected, paused, etc
     for( int row=0; row<rowCount; ++row ) {
         const QModelIndex modelIndex( model->index( row, 0 ) );
         assert( model == modelIndex.model( ) );
         const Torrent * tor( model->data( modelIndex, TorrentModel::TorrentRole ).value<const Torrent*>( ) );
-        const bool isSelected( selectionModel->isSelected( modelIndex ) );
-        const bool isPaused( tor->isPaused( ) );
-        if( isSelected )
-            ++selected;
-        if( isPaused )
-            ++ paused;
-        if( isSelected && isPaused )
-            ++selectedAndPaused;
-        if( tor->canManualAnnounce( ) )
-            ++canAnnounce;
+        if( tor ) {
+            const bool isSelected( selectionModel->isSelected( modelIndex ) );
+            const bool isPaused( tor->isPaused( ) );
+            if( isSelected )
+                ++selected;
+            if( isPaused )
+                ++ paused;
+            if( isSelected && isPaused )
+                ++selectedAndPaused;
+            if( tor->canManualAnnounce( ) )
+                ++canAnnounce;
+        }
     }