diff --git a/macosx/Controller.m b/macosx/Controller.m
index 1dccbc4f2..03104ad0b 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1214,14 +1214,11 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
- (void) resumeAllTorrents: (id) sender
{
- NSMutableArray * torrents = [NSMutableArray arrayWithArray: fTorrents];
+ NSMutableArray * torrents = [NSMutableArray arrayWithCapacity: [fTorrents count]];
- if (![fDefaults boolForKey: @"ResumeAllIncludesFinished"])
- {
- for (NSInteger i = [torrents count]-1; i >=0; --i)
- if ([[torrents objectAtIndex: i] isFinishedSeeding])
- [torrents removeObjectAtIndex: i];
- }
+ for (Torrent * torrent in fTorrents)
+ if (![torrent isFinishedSeeding])
+ [torrents addObject: torrent];
[self resumeTorrents: torrents];
}
@@ -3857,8 +3854,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
if (action == @selector(resumeAllTorrents:))
{
for (Torrent * torrent in fTorrents)
- if (![torrent isActive] && ![torrent waitingToStart]
- && (![torrent isFinishedSeeding] || [fDefaults boolForKey: @"ResumeAllIncludesFinished"]))
+ if (![torrent isActive] && ![torrent waitingToStart] && ![torrent isFinishedSeeding])
return YES;
return NO;
}
diff --git a/macosx/Defaults.plist b/macosx/Defaults.plist
index 045ff8368..ae9f1bd49 100644
--- a/macosx/Defaults.plist
+++ b/macosx/Defaults.plist
@@ -130,8 +130,6 @@
2
RenamePartialFiles
- ResumeAllIncludesFinished
-
RPC
RPCAuthorize
diff --git a/macosx/en.lproj/PrefsWindow.xib b/macosx/en.lproj/PrefsWindow.xib
index 9fe31e61b..1627309e5 100644
--- a/macosx/en.lproj/PrefsWindow.xib
+++ b/macosx/en.lproj/PrefsWindow.xib
@@ -2,19 +2,17 @@
1050
- 10D573
+ 10C540
740
- 1038.29
- 460.00
+ 1038.25
+ 458.00
-
+
256
YES
256
- {{311, 136}, {35, 22}}
+ {{311, 156}, {35, 22}}
YES
@@ -1038,7 +1037,7 @@
256
- {{41, 138}, {56, 17}}
+ {{41, 158}, {56, 17}}
YES
@@ -1054,7 +1053,7 @@
256
- {{351, 138}, {101, 17}}
+ {{351, 158}, {101, 17}}
YES
@@ -1089,28 +1088,6 @@
25
-
-
- 256
- {{100, 176}, {328, 18}}
-
- YES
-
- 67239424
- 0
- Resume All includes seeding-complete transfers
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
256
@@ -1180,13 +1157,13 @@
256
- {{39, 218}, {58, 17}}
+ {{24, 218}, {73, 17}}
YES
67239424
4194304
- Seeding:
+ Automatic:
@@ -1224,7 +1201,7 @@
256
- {{100, 137}, {205, 18}}
+ {{100, 157}, {205, 18}}
YES
@@ -1246,7 +1223,7 @@
256
- {{297, 110}, {35, 22}}
+ {{297, 130}, {35, 22}}
YES
@@ -1309,7 +1286,7 @@
256
- {{337, 112}, {101, 17}}
+ {{337, 132}, {101, 17}}
YES
@@ -1325,7 +1302,7 @@
256
- {{100, 111}, {191, 18}}
+ {{100, 131}, {191, 18}}
YES
@@ -1347,7 +1324,7 @@
256
- {{374, 84}, {41, 22}}
+ {{374, 104}, {41, 22}}
YES
@@ -1409,7 +1386,7 @@
256
- {{420, 86}, {55, 17}}
+ {{420, 106}, {55, 17}}
YES
@@ -1425,7 +1402,7 @@
256
- {{100, 85}, {268, 18}}
+ {{100, 105}, {268, 18}}
YES
@@ -1447,7 +1424,7 @@
256
- {{20, 46}, {77, 17}}
+ {{20, 66}, {77, 17}}
YES
@@ -1463,7 +1440,7 @@
-
+
256
YES
@@ -3424,7 +3465,6 @@ AAABAAAAAQ
{542, 318}
-
NSView
NSResponder
@@ -4518,10 +4558,6 @@ AAABAAAAAQ
NSResponder
-
- YES
- ResumeAllIncludesFinished
-
YES
@@ -7850,22 +7886,6 @@ AAABAAAAAQ
1946
-
-
- value: values.ResumeAllIncludesFinished
-
-
-
-
-
- value: values.ResumeAllIncludesFinished
- value
- values.ResumeAllIncludesFinished
- 2
-
-
- 1951
-
@@ -8218,7 +8238,6 @@ AAABAAAAAQ
-
@@ -10654,20 +10673,6 @@ AAABAAAAAQ
-
- 1947
-
-
- YES
-
-
-
-
-
- 1948
-
-
-
@@ -11066,9 +11071,6 @@ AAABAAAAAQ
194.IBPluginDependency
194.ImportedFromIB2
1940.IBPluginDependency
- 1947.IBPluginDependency
- 1947.ImportedFromIB2
- 1948.IBPluginDependency
195.IBPluginDependency
195.ImportedFromIB2
196.IBPluginDependency
@@ -11672,9 +11674,6 @@ AAABAAAAAQ
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -11784,7 +11783,7 @@ AAABAAAAAQ
com.apple.InterfaceBuilder.CocoaPlugin
- {{442, 355}, {542, 307}}
+ {{333, 401}, {542, 307}}
com.apple.InterfaceBuilder.CocoaPlugin
{{429, 310}, {539, 288}}
@@ -11902,7 +11901,7 @@ AAABAAAAAQ
- 1951
+ 1946