Fix mtoc detection

benbaker76 · Dec 23, 2021 · 78c8816 · 78c8816
1 parent 2918250
commit 78c8816
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Hackintool.xcodeproj/project.pbxproj b/Hackintool.xcodeproj/project.pbxproj
@@ -721,7 +721,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0382;
+				CURRENT_PROJECT_VERSION = 0383;
 				DEVELOPMENT_TEAM = 5LGHPJM9ZR;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -736,7 +736,7 @@
 				INFOPLIST_FILE = "Hackintool/Hackintool-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 3.8.2;
+				MARKETING_VERSION = 3.8.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -757,7 +757,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0382;
+				CURRENT_PROJECT_VERSION = 0383;
 				DEVELOPMENT_TEAM = 5LGHPJM9ZR;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -772,7 +772,7 @@
 				INFOPLIST_FILE = "Hackintool/Hackintool-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 3.8.2;
+				MARKETING_VERSION = 3.8.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/...deproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Hackintool/AppDelegate.m b/Hackintool/AppDelegate.m
@@ -38,8 +38,8 @@
 #include <cstddef>
 
 #define MyPrivateTableViewDataType	@"MyPrivateTableViewDataType"
-#define BluetoothPath1				@"com.apple.Bluetoothd.plist"
-#define BluetoothPath2				@"blued.plist"
+#define BluetoothPath1				@"/private/var/root/Library/Preferences/com.apple.bluetoothd.plist" // High Sierra
+#define BluetoothPath2				@"/private/var/root/Library/Preferences/blued.plist" // Sierra
 #define PCIIDsUrl					@"https://pci-ids.ucw.cz/pci.ids"
 #define PCIIDsPath					[[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject] stringByAppendingPathComponent:@"pci.ids"]
 #define USBIDsUrl					@"http://www.linux-usb.org/usb.ids"
@@ -501,7 +501,7 @@ - (void)updateSystemInfo
 			[self addToList:_systemInfoArray name:@"VDA Decoder" value:GetLocalizedString(@"Decoder Failed")];
 			break;
 		default:
-			[self addToList:_systemInfoArray name:@"VDA Decoder" value:[NSString stringWithFormat:GetLocalizedString(@"Unknown Status (%@)"), decoderStatus]];
+			[self addToList:_systemInfoArray name:@"VDA Decoder" value:[NSString stringWithFormat:GetLocalizedString(@"Unknown Status (%d)"), (int)decoderStatus]];
 			break;
 	}
 
@@ -2834,7 +2834,7 @@ - (void)compileSelectedKexts
 			return;
 	}
 
-	if (![[NSFileManager defaultManager] fileExistsAtPath:mtocDst1] || ![[NSFileManager defaultManager] fileExistsAtPath:mtocDst2])
+	if (![[NSFileManager defaultManager] fileExistsAtPath:mtocDst1] && ![[NSFileManager defaultManager] fileExistsAtPath:mtocDst2])
 	{
 		if ([self showAlert:@"Missing mtoc or mtoc.NEW!" text:@"Click OK to run installation."])
 		{