Merge recent improvements from branch 'FrozenForMacOS10.10'

Author: jerrykrinock

SSYAlert.h

@@ -710,6 +710,15 @@ extern NSObject <SSYAlertErrorHideManager> * gSSYAlertErrorHideManager ;
  If the error returns a -localizedFailureReason, presents that in the smallText 
  following a localized label "Possible reason for Error:".
  
+ If the error contains a SSYHelpUrlErrorKey in its info dictionary, presents a
+ help button which upon being clicked opens that Help URL in the user's default
+ web browser.
+ 
+ If the error returns a -helpAnchor and does not contain a SSYHelpUrlErrorKey
+ in its info dictionary, presents a help button which upon being clicked
+ opens that help anchor in the app's Help Book.  If both the SSYHelpUrlErrorKey
+ and -helpAnchor are present in the error, the latter is ignored.
+ 
  If the error returns a -localizedRecoverySuggestion, presents that in the small text
  folowing a localized label "Suggestion to Fix this Error:".
  

SSYAlert.m

@@ -857,6 +857,25 @@ - (void)stealObjectsFromAppleAlerts {
 
     // Steal the icon.  (Could also get this from NSBundle I suppose.)
     NSImage* rawIcon = [nsAlert icon] ;
+
+    /* The next line was added to fix a crash during subsequent app quitting
+     which started in macOS 12:
+     * Assertion failed: (![[NSApp _openWindows] NS_containsObjectIdenticalTo:self]), function -[NSWindow dealloc], file NSWindow.m, line 1579
+     I only noticed this if I quit after licensing.  After licensing, there
+     are two SSYAlert objects created and destroyed in succession.  The first
+     one shows the downloaded License Information and the second one I forgot
+     what it shows.  Anyhow, I noticted that if I quit the app immediately
+     after dismissing those two SSYAlerts in succession, the array returned by
+     [NSApplication windows] included two _NSAlertPanel which I found were
+     attached to the `nsAlert` created here.  Even after the fix, these two
+     _NSAlertPanel objects remain in [NSApplication windows] for some time, but
+     will be found to be gone later if you do not quit immediately.  Although
+     sending either -close or -performClose: fixed the assertion+crash, I
+     decided on the former since the latter calls NSBeep, probably because
+     the "window doesn’t have a close button", as explained in documentation
+     of -[NSWindow performClose:].  */
+    [nsAlert.window close];
+    
 #if !__has_feature(objc_arc)
     [nsAlert release] ;
 #endif
@@ -2403,14 +2422,22 @@ - (void)doLayoutError:(NSError*)error {
 		[self setTitleText:title] ;			
 	}
 
-	// Set Help Anchor
+	// Set Help Anchor if given by help anchor
 	{
 		NSString* helpAddress = [error helpAnchor] ;
 		if (helpAddress) {
 			[self setHelpAddress:helpAddress] ;
 		}
 	}
-	
+
+    // Set Help Anchor if given by help URL (may override helpAnchor)
+    {
+        NSURL* helpUrl = [[error userInfo] objectForKey:SSYHelpUrlErrorKey] ;
+        if (helpUrl) {
+            [self setHelpAddress:helpUrl.absoluteString] ;
+        }
+    }
+
 	// Set smallText
 	[self setSmallText:[error localizedDeepDescription]] ;
 

SSYOperationQueue.m

@@ -239,8 +239,12 @@ - (void)observeValueForKeyPath:(NSString*)keyPath
                  
                  Sorry, on 20200601, again while running the Safari/run.sh test
                  AppleScript, it crashed again.  So I increased the sleep time
-                 to 2. */
-                sleep(2);
+                 to 2.
+                 
+                 Sorry, on 202103XX, again while running the Safari/run.sh test
+                 AppleScript, it crashed again.  So I increased the sleep time
+                 to 5. */
+                sleep(5);
                 [scriptCommand resumeExecutionWithResult:[self scriptResult]] ;
                 [self setScriptCommand:nil] ;
             }

SSYShortcutBackEnd.m

@@ -42,5 +42,4 @@ - (void)shortcutRecorder:(SRRecorderControl*)aRecorder
 										selectorName:[self selectorName]] ;
 }
 
-
-@end
+@end