[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/19 14:52:11

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTInteractive.ml 

Log message:
        patch #5106

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.834&tr2=1.835&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.91&tr2=1.92&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.834 mldonkey/distrib/ChangeLog:1.835
--- mldonkey/distrib/ChangeLog:1.834    Fri May 19 14:50:47 2006
+++ mldonkey/distrib/ChangeLog  Fri May 19 14:52:11 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/05/19
+5106: BT: only send stop once on exit and then wait for success (Amorphous)
 5105: BT: Avoid starting torrent which has the same name
       as a currently downloading torrent
 
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.91 
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.92
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.91      Fri May 19 
14:50:47 2006
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml   Fri May 19 14:52:11 2006
@@ -1089,8 +1089,13 @@
   network.op_network_search <- (fun ss buf -> ());
   network.op_network_download <- (fun r -> dummy_file);
   network.op_network_recover_temp <- (fun s -> ());
+  let clean_exit_started = ref false in
   network.op_network_clean_exit <- (fun s ->
-    List.iter (fun file -> BTClients.file_stop file) !current_files;
+    if not !clean_exit_started then
+      begin
+        List.iter (fun file -> BTClients.file_stop file) !current_files;
+        clean_exit_started := true;
+      end;
     List.for_all (fun file -> not file.file_tracker_connected) !current_files;
   );