X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ConfigsController.m;h=8870fab6d0aa3715c7fe1a9fde681601b38e7759;hp=769fabde56158060e5951f2108e324a6d3660b40;hb=62aa5b73be6ec1e499e6b155cd0e7687c338cbaa;hpb=15a3aec049658f4a1c3c6e8c9f8a549fb8de0782

diff --git a/ConfigsController.m b/ConfigsController.m
index 769fabd..8870fab 100644
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -48,9 +48,8 @@
         return;
     manualConfig = config;
     _currentConfig = config;
-    [targetController reset];
     [removeButton setEnabled:_configs[0] != config];
-    [targetController load];
+    [targetController loadCurrent];
     [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged];
     [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[_configs indexOfObject:config]] byExtendingSelection:NO];
 }
@@ -61,7 +60,7 @@
     [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
     [tableView reloadData];
     [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:_configs.count - 1] byExtendingSelection:NO];
-    [tableView editColumn:0 row:[_configs count] - 1 withEvent:nil select:YES];
+    [tableView editColumn:0 row:_configs.count - 1 withEvent:nil select:YES];
 }
 
 - (IBAction)removePressed:(id)sender {
@@ -85,22 +84,21 @@
         [self activateConfig:_configs[tableView.selectedRow]];
 }
 
-- (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(int)index {
+- (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)index {
     return [_configs[index] name];
 }
 
-- (void)tableView:(NSTableView *)view setObjectValue:(NSString *)obj forTableColumn:(NSTableColumn *)col row:(int)index {
+- (void)tableView:(NSTableView *)view setObjectValue:(NSString *)obj forTableColumn:(NSTableColumn *)col row:(NSInteger)index {
     [(Config *)_configs[index] setName:obj];
-    [targetController refreshConfigsPreservingSelection:YES];
     [tableView reloadData];
     [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged];
 }
 
-- (int)numberOfRowsInTableView:(NSTableView*)table {
-    return [_configs count];
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
+    return _configs.count;
 }
 
-- (BOOL)tableView:(NSTableView *)view shouldEditTableColumn:(NSTableColumn *)column row:(int)index {
+- (BOOL)tableView:(NSTableView *)view shouldEditTableColumn:(NSTableColumn *)column row:(NSInteger)index {
     return index > 0;
 }
 
@@ -138,7 +136,7 @@
         [newConfigs addObject:cfg];
     }
 
-    for (int i = 0; i < storedConfigs.count; ++i) {
+    for (unsigned i = 0; i < storedConfigs.count; ++i) {
         NSDictionary *entries = storedConfigs[i][@"entries"];
         Config *config = newConfigs[i];
         for (id key in entries)
@@ -147,7 +145,7 @@
     }
     
     if (newConfigs.count) {
-        int current = [envelope[@"selectedConfiguration"] unsignedIntValue];
+        unsigned current = [envelope[@"selectedConfiguration"] unsignedIntValue];
         if (current >= newConfigs.count)
             current = 0;
         _configs = newConfigs;