Changeset 9628

Timestamp:

Nov 29, 2009, 8:29:57 AM (12 years ago)

Author:

charles

Message:

(trunk gtk) fix r9625 oops on adding torrents by their raw 40 character hex hashcode from the commandline in the GTK+ client

Location:

trunk/gtk

Files:

• tr-core.c (modified) (2 diffs)
• util.c (modified) (1 diff)

trunk/gtk/tr-core.c

@@ -1104 +1104 @@
         tr_core_add_from_url( core, filename );
     }
-    else /* try it as a local file */
+    else if( g_file_test( filename, G_FILE_TEST_EXISTS ) )
     {
         int err;
@@ -1116 +1116 @@
         if( err == TR_PARSE_ERR )
             tr_core_errsig( core, TR_PARSE_ERR, filename );
+    }
+    else if( gtr_is_hex_hashcode( filename ) )
+    {
+        tr_core_add_from_url( core, filename );
     }
 }

trunk/gtk/util.c

@@ -374 +374 @@
             if( g_file_test( filename, G_FILE_TEST_EXISTS ) )
                 ret = g_slist_prepend( ret, filename );
-            else if( gtr_is_hex_hashcode( filename ) )
-                ret = g_slist_prepend( ret, filename );
-            else
+            else {
+                if( gtr_is_hex_hashcode( argv[i] ) )
+                    ret = g_slist_prepend( ret, g_strdup( argv[i] ) );
                 g_free( filename );
+            }
         }
     }