From: Joe Wreschnig <joe.wreschnig@gmail.com>
Date: Sat, 2 Mar 2013 02:51:36 +0000 (+0100)
Subject: Nicer function to present the error.
X-Git-Tag: version-1.0~58
X-Git-Url: https://git.yukkurigames.com/?a=commitdiff_plain;h=4928acbee7fef98bce8188956cde9c15fac975be;p=enjoyable.git

Nicer function to present the error.
---

diff --git a/ConfigsController.m b/ConfigsController.m
index 1c100f2..5aab09a 100644
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -231,10 +231,11 @@
                       }
                       
                       if (error) {
-                          [[NSAlert alertWithError:error] beginSheetModalForWindow:window
-                                                                     modalDelegate:nil
-                                                                    didEndSelector:nil
-                                                                       contextInfo:nil];
+                          [window presentError:error
+                                modalForWindow:window
+                                      delegate:nil
+                            didPresentSelector:nil
+                                   contextInfo:nil];
                       }
                   }];
      
@@ -248,27 +249,23 @@
     NSWindow *window = NSApplication.sharedApplication.keyWindow;
     [panel beginSheetModalForWindow:window
                   completionHandler:^(NSInteger result) {
-                      if (result == NSFileHandlingPanelOKButton) {
-                          NSError *error;
-                          NSDictionary *serialization = [cfg serialize];
-                          NSData *json = [NSJSONSerialization dataWithJSONObject:serialization
-                                                                         options:NSJSONWritingPrettyPrinted
-                                                                           error:&error];
-                          if (!error)
-                              [json writeToURL:panel.URL options:NSDataWritingAtomic error:&error];
-                          
-                          if (error) {
-                              // FIXME: Ideally, this sheet is attached to the
-                              // panel, and the panel doesn't close, so you
-                              // can maybe fix what is wrong and try saving
-                              // again. But it seems to be impossible to force
-                              // the panel to stay open.
-                              [panel close];
-                              [[NSAlert alertWithError:error] beginSheetModalForWindow:window
-                                                                         modalDelegate:nil
-                                                                        didEndSelector:nil
-                                                                           contextInfo:nil];
-                          }
+                      if (result != NSFileHandlingPanelOKButton)
+                          return;
+                      [panel close];
+                      NSError *error;
+                      NSDictionary *serialization = [cfg serialize];
+                      NSData *json = [NSJSONSerialization dataWithJSONObject:serialization
+                                                                     options:NSJSONWritingPrettyPrinted
+                                                                       error:&error];
+                      if (!error)
+                          [json writeToURL:panel.URL options:NSDataWritingAtomic error:&error];
+                      
+                      if (error) {
+                          [window presentError:error
+                                modalForWindow:window
+                                      delegate:nil
+                            didPresentSelector:nil
+                                   contextInfo:nil];
                       }
                   }];
 }