From 838dbf4cf24835d3ccd76954cbfdb2782ec828bb Mon Sep 17 00:00:00 2001
From: "Dustin L. Howett" <dustin@howett.net>
Date: Mon, 3 May 2010 06:50:58 +0000
Subject: [PATCH] 'Cancel' now works in-place on not-iPad as well, instead of
 popping the current list.

---
 Settings.mm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Settings.mm b/Settings.mm
index edc0d3f..6c4cd01 100644
--- 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];
-- 
2.47.2