From adcbf84e7bf14b60cfd94c1585f34c6b18d3707f Mon Sep 17 00:00:00 2001 From: Sunnyyoung Date: Sat, 8 May 2021 13:49:18 +0800 Subject: [PATCH] Fix multiple instaces issue #230 #237 #240 #246 etc --- WeChatTweak/WeChatTweak.m | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/WeChatTweak/WeChatTweak.m b/WeChatTweak/WeChatTweak.m index e81e0f0..595f6fb 100755 --- a/WeChatTweak/WeChatTweak.m +++ b/WeChatTweak/WeChatTweak.m @@ -16,8 +16,6 @@ #import "WTConfigManager.h" #import "RecallCacheManager.h" -static NSString * const WeChatTweakOpenNewWeChatKey = @"WeChatTweakOpenNewWeChatKey"; - // Global Function static NSString *(*original_NSHomeDirectory)(void); static NSArray *(*original_NSSearchPathForDirectoriesInDomains)(NSSearchPathDirectory directory, NSSearchPathDomainMask domainMask, BOOL expandTilde); @@ -401,8 +399,7 @@ static void __attribute__((constructor)) tweak(void) { } + (NSArray *)tweak_runningApplicationsWithBundleIdentifier:(NSString *)bundleIdentifier { - BOOL openNewWeChat = [NSUserDefaults.standardUserDefaults boolForKey:WeChatTweakOpenNewWeChatKey]; - if (openNewWeChat && [bundleIdentifier isEqualToString:NSBundle.mainBundle.bundleIdentifier] ) { + if ([bundleIdentifier isEqualToString:NSBundle.mainBundle.bundleIdentifier] ) { return @[NSRunningApplication.currentApplication]; } else { return [self tweak_runningApplicationsWithBundleIdentifier:bundleIdentifier]; @@ -419,16 +416,12 @@ static void __attribute__((constructor)) tweak(void) { } - (void)openNewWeChatInstace:(id)sender { - [NSUserDefaults.standardUserDefaults setBool:YES forKey:WeChatTweakOpenNewWeChatKey]; - [NSUserDefaults.standardUserDefaults synchronize]; NSString *applicationPath = NSBundle.mainBundle.bundlePath; NSTask *task = [[NSTask alloc] init]; task.launchPath = @"/usr/bin/open"; task.arguments = @[@"-n", applicationPath]; [task launch]; [task waitUntilExit]; - [NSUserDefaults.standardUserDefaults removeObjectForKey:WeChatTweakOpenNewWeChatKey]; - [NSUserDefaults.standardUserDefaults synchronize]; } #pragma mark - Auto Auth