diff --git a/NEWS b/NEWS
index 37abeed78..fc43f0d08 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
NEWS file for Transmission
0.72 (2007/04/30)
- - Reset download/upload rates when sending "started"
+ - Reset download/upload amounts when sending "started"
- Fix rare XML parsing bug
0.71 (2007/04/23)
diff --git a/appcast.xml b/appcast.xml
index 9e10d9b8a..c00e600a7 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -15,7 +15,7 @@
Transmission Changes:
- - Reset download/upload rates when sending "started"
+ - Reset download/upload amounts when sending "started"
- Fix rare XML parsing bug
]]>
Mon, 30 Apr 2007 11:39:00 -0400
diff --git a/macosx/Controller.m b/macosx/Controller.m
index d26998925..bec45222f 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -526,10 +526,6 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
//clear badge
[fBadger clearBadge];
- //end quickly if the app is updating
- if (fUpdateInProgress)
- return;
-
//wait for running transfers to stop (5 second timeout)
NSDate * start = [NSDate date];
BOOL timeUp = NO;
@@ -537,11 +533,13 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
enumerator = [fTorrents objectEnumerator];
Torrent * torrent;
while (!timeUp && (torrent = [enumerator nextObject]))
+ {
while (![torrent isPaused] && !(timeUp = [start timeIntervalSinceNow] < -5.0))
{
usleep(100000);
[torrent update];
}
+ }
//wait for NAT to be disabled (same 5 second timeout)
while (!([start timeIntervalSinceNow] < -5.0)