Fix 'Disable Volume OSD' being not disabled on Software Only displays (MonitorControl#542)

waydabber · web-flow · commit f0d09f534658 · 2021-08-27T21:15:21.000+02:00
diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>2884</string>
+	<string>2886</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/MonitorControl/View Controllers/DisplaysPrefsViewController.swift b/MonitorControl/View Controllers/DisplaysPrefsViewController.swift
@@ -131,7 +131,7 @@ class DisplaysPrefsViewController: NSViewController, PreferencePane, NSTableView
         cell.displayImage.image = NSImage(named: NSImage.computerName)!
       }
       // Disable Volume OSD
-      if let externalDisplay = display as? ExternalDisplay, !externalDisplay.isVirtual {
+      if let externalDisplay = display as? ExternalDisplay, !externalDisplay.isVirtual, !externalDisplay.isSw() {
         cell.disableVolumeOSDButton.state = externalDisplay.hideOsd ? .on : .off
         cell.disableVolumeOSDButton.isEnabled = true
       } else {
diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>2884</string>
+	<string>2886</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ class DisplaysPrefsViewController: NSViewController, PreferencePane, NSTableView`
`131`	`131`	`cell.displayImage.image = NSImage(named: NSImage.computerName)!`
`132`	`132`	`}`
`133`	`133`	`// Disable Volume OSD`
`134`		`- if let externalDisplay = display as? ExternalDisplay, !externalDisplay.isVirtual {`
	`134`	`+ if let externalDisplay = display as? ExternalDisplay, !externalDisplay.isVirtual, !externalDisplay.isSw() {`
`135`	`135`	`cell.disableVolumeOSDButton.state = externalDisplay.hideOsd ? .on : .off`
`136`	`136`	`cell.disableVolumeOSDButton.isEnabled = true`
`137`	`137`	`} else {`