From 53d293dc74683b8f738baf22afd7e6266722712a Mon Sep 17 00:00:00 2001 From: clyang Date: Mon, 9 Oct 2017 23:45:26 +0800 Subject: [PATCH] Revert connectLocation function and bump version to 2.9.7 --- src/Info.plist | 4 ++-- src/WLMainFrameController.m | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Info.plist b/src/Info.plist index 1951ba7..1c8996e 100644 --- a/src/Info.plist +++ b/src/Info.plist @@ -25,7 +25,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.9.6.3 + 2.9.7 CFBundleSignature abgK CFBundleURLTypes @@ -49,7 +49,7 @@ CFBundleVersion - 912 + 913 LSMinimumSystemVersion 10.7.0 LSMinimumSystemVersionByArchitecture diff --git a/src/WLMainFrameController.m b/src/WLMainFrameController.m index 7bfbd0a..66da93b 100644 --- a/src/WLMainFrameController.m +++ b/src/WLMainFrameController.m @@ -360,7 +360,7 @@ - (IBAction)setEncoding:(id)sender { - (IBAction)connectLocation:(id)sender { [sender abortEditing]; [[_tabView window] makeFirstResponder:_tabView]; - BOOL ssh = NO; + BOOL ssh = NO, WSS = NO; NSString *name = [sender stringValue]; if ([[name lowercaseString] hasPrefix:@"ssh://"]) @@ -370,8 +370,6 @@ - (IBAction)connectLocation:(id)sender { name = [name substringFromIndex: 9]; if ([[name lowercaseString] hasPrefix:@"bbs://"]) name = [name substringFromIndex: 6]; - if ([[name lowercaseString] hasPrefix:@"wss://"]) - name = [name substringFromIndex: 6]; NSMutableArray *matchedSites = [NSMutableArray array]; WLSite *s;