OS version fix. USB revert

benbaker76 · Jan 19, 2021 · a385397 · a385397
1 parent a1c781e
commit a385397
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 45 deletions.
diff --git a/Hackintool.xcodeproj/project.pbxproj b/Hackintool.xcodeproj/project.pbxproj
@@ -717,7 +717,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0352;
+				CURRENT_PROJECT_VERSION = 0353;
 				DEVELOPMENT_TEAM = 5LGHPJM9ZR;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -732,7 +732,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.5.2;
+				MARKETING_VERSION = 3.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -753,7 +753,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0352;
+				CURRENT_PROJECT_VERSION = 0353;
 				DEVELOPMENT_TEAM = 5LGHPJM9ZR;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
@@ -768,7 +768,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.5.2;
+				MARKETING_VERSION = 3.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.Hackintool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Hackintool/AppDelegate.m b/Hackintool/AppDelegate.m
@@ -3375,7 +3375,9 @@ - (void)refreshUSBPorts
 
 		if (usbConnector == nil && portType == nil)
 		{
-            [propertyDictionary setObject:[NSNumber numberWithInt:kTypeA] forKey:hubName != nil ? @"portType" : @"UsbConnector"];
+            //[propertyDictionary setObject:[NSNumber numberWithInt:kTypeA] forKey:hubName != nil ? @"portType" : @"UsbConnector"];
+
+            continue;
 		}
 
 		if (hubName != nil)

diff --git a/Hackintool/MiscTools.m b/Hackintool/MiscTools.m
@@ -662,47 +662,56 @@ unsigned long long binaryToDecimal(NSString *str)
 	NSString *osVersionString = [processInfo operatingSystemVersionString];
 	NSString *codeName = @"";
 
-    switch(version.minorVersion)
+    if (version.majorVersion == 10)
     {
-    case 4:
-        codeName = @"Mac OS X Tiger";
-        break;
-    case 5:
-        codeName = @"Mac OS X Leopard";
-        break;
-    case 6:
-        codeName = @"Mac OS X Snow Leopard";
-        break;
-    case 7:
-        codeName = @"Mac OS X Lion";
-        break;
-    case 8:
-        codeName = @"OS X Mountain Lion";
-        break;
-    case 9:
-        codeName = @"OS X Mavericks";
-        break;
-    case 10:
-        codeName = @"OS X Yosemite";
-        break;
-    case 11:
-        codeName = @"OS X El Capitan";
-        break;
-    case 12:
-        codeName = @"macOS Sierra";
-        break;
-    case 13:
-        codeName = @"macOS High Sierra";
-        break;
-    case 14:
-        codeName = @"macOS Mojave";
-        break;
-    case 15:
-        codeName = @"macOS Catalina";
-        break;
-    case 16:
-        codeName = @"macOS Big Sur";
-        break;
+        switch(version.minorVersion)
+        {
+        case 4:
+            codeName = @"Mac OS X Tiger";
+            break;
+        case 5:
+            codeName = @"Mac OS X Leopard";
+            break;
+        case 6:
+            codeName = @"Mac OS X Snow Leopard";
+            break;
+        case 7:
+            codeName = @"Mac OS X Lion";
+            break;
+        case 8:
+            codeName = @"OS X Mountain Lion";
+            break;
+        case 9:
+            codeName = @"OS X Mavericks";
+            break;
+        case 10:
+            codeName = @"OS X Yosemite";
+            break;
+        case 11:
+            codeName = @"OS X El Capitan";
+            break;
+        case 12:
+            codeName = @"macOS Sierra";
+            break;
+        case 13:
+            codeName = @"macOS High Sierra";
+            break;
+        case 14:
+            codeName = @"macOS Mojave";
+            break;
+        case 15:
+            codeName = @"macOS Catalina";
+            break;
+        }
+    }
+    else if (version.majorVersion == 11)
+    {
+        switch(version.minorVersion)
+        {
+        case 1:
+            codeName = @"macOS Big Sur";
+            break;
+        }
     }
 
 	return [NSString stringWithFormat:@"%@ %@", codeName, osVersionString];