'Cancel' now works in-place on not-iPad as well, instead of popping the current list.

diff --git a/Settings.mm b/Settings.mm
index edc0d3f5bc8db0ed13a393780b10abb93b9042e4..6c4cd0142b9434275b7f4314227b75a91ce45dd9 100644 (file)
--- a/Settings.mm
+++ b/Settings.mm
@@ -456,6 +456,8 @@ static NSString *_plist;
     if (![[PSViewController class] instancesRespondToSelector:@selector(showLeftButton:withStyle:rightButton:withStyle:)]) {
         self.navigationItem.leftBarButtonItem = nil;
         self.navigationItem.rightBarButtonItem = nil;
+    } else {
+        [self showLeftButton:nil withStyle:0 rightButton:nil withStyle:0];
     }
     settingsChanged = NO;
 }
@@ -466,8 +468,10 @@ static NSString *_plist;
         return;
     }
 
-    if (buttonIndex == 0)
+    if (buttonIndex == 0) {
         [self cancelChanges];
+        return;
+    }
 
     [self suspend];
     [self.rootController popController];