X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=NJMappingsController.m;h=2063d24d8272e100ad4246b0b9400796ec1652d3;hp=0adb1f9868fa644b16b346b907323b2b31e42a8e;hb=717d100a4657927592d0ccfc16c8cd33f80c0609;hpb=17f6cc8c8f090b4bb77c88bd5f8bb940e0f894c9

diff --git a/NJMappingsController.m b/NJMappingsController.m
index 0adb1f9..2063d24 100644
--- a/NJMappingsController.m
+++ b/NJMappingsController.m
@@ -116,8 +116,9 @@
     if (tableView.selectedRow == 0)
         return;
     
-    [_mappings removeObjectAtIndex:tableView.selectedRow];
-    [self activateMapping:_mappings[0]];
+    NSInteger selectedRow = tableView.selectedRow;
+    [_mappings removeObjectAtIndex:selectedRow];
+    [self activateMapping:_mappings[MIN(selectedRow, _mappings.count - 1)]];
     [self mappingsChanged];
 }