Fix IORegistry Import assert failure

benbaker76 · Feb 29, 2020 · 3be9e12 · 3be9e12
1 parent 6219bc8
commit 3be9e12
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/PinConfigurator.xcodeproj/project.pbxproj b/PinConfigurator.xcodeproj/project.pbxproj
@@ -364,15 +364,15 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0220;
+				CURRENT_PROJECT_VERSION = 0221;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
 				INFOPLIST_FILE = PinConfigurator/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.PinConfigurator;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -388,15 +388,15 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0220;
+				CURRENT_PROJECT_VERSION = 0221;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
 				INFOPLIST_FILE = PinConfigurator/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Headsoft.PinConfigurator;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

diff --git a/...deproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/headsoft.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/PinConfigurator/AppDelegate.m b/PinConfigurator/AppDelegate.m
@@ -658,7 +658,7 @@ - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTab
 	else if (outlineView == [self importIORegOutlineView])
 	{
 		AudioDevice *audioDevice = item;
-		NSString *deviceName = (audioDevice.codecID != 0 ? audioDevice.codecName : audioDevice.deviceName);
+		NSString *deviceName = (audioDevice.audioDeviceModelID != 0 ? audioDevice.audioDeviceName : (audioDevice.codecID != 0 ? audioDevice.codecName : audioDevice.deviceName));
 
 		switch ([[tableColumn identifier] intValue])
 		{
@@ -684,7 +684,7 @@ - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTab
 				[cell setStringValue:(audioDevice.codecID != 0 ? [NSString stringWithFormat:@"0x%04X", audioDevice.codecRevisionID & 0xFFFF] : @"-")];
 				break;
 			case 7:
-				[cell setStringValue:(audioDevice.audioDeviceModelID != 0 ? audioDevice.audioDeviceName : deviceName)];
+				[cell setStringValue:(deviceName != nil ? deviceName : @"???")];
 				break;
 		}
 	}