Changeset 4354

Timestamp:

Dec 27, 2007, 6:56:54 PM (14 years ago)

Author:

charles

Message:

safer version of r4348

File:

• trunk/gtk/tr_core.c (modified) (3 diffs)

trunk/gtk/tr_core.c

@@ -186 +186 @@
 {
     int i;
+    tr_torrent *ta, *tb;
     const tr_stat *sa, *sb;
-    gtk_tree_model_get( model, a, MC_STAT, &sa, -1 );
-    gtk_tree_model_get( model, b, MC_STAT, &sb, -1 );
+
+    gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 );
+    gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 );
+
+    sa = tr_torrentStatCached( ta );
+    sb = tr_torrentStatCached( tb );
 
     if(( i = compareDouble( sa->rateUpload + sa->rateDownload,
@@ -232 +237 @@
 {
     int ret;
+    tr_torrent *ta, *tb;
     const tr_stat *sa, *sb;
-    gtk_tree_model_get( model, a, MC_STAT, &sa, -1 );
-    gtk_tree_model_get( model, b, MC_STAT, &sb, -1 );
+    gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 );
+    gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 );
+    sa = tr_torrentStatCached( ta );
+    sb = tr_torrentStatCached( tb );
     ret = compareDouble( sa->percentDone, sb->percentDone );
     if( !ret )
@@ -247 +255 @@
                 gpointer         user_data UNUSED )
 {
-    const tr_stat *sa, *sb;
-    gtk_tree_model_get( model, a, MC_STAT, &sa, -1 );
-    gtk_tree_model_get( model, b, MC_STAT, &sb, -1 );
-    return sa->status - sb->status;
+    tr_torrent *ta, *tb;
+    gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 );
+    gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 );
+    return tr_torrentStatCached(ta)->status - tr_torrentStatCached(tb)->status;
 }