Merge pull request #777 from johzzy/master

kyleneideck · web-flow · commit 4b7caeeb541e · 2024-12-06T21:07:47.000+11:00
fix crash in BGMPlayThrough::IsRunningSomewhereOtherThanBGMApp
diff --git a/BGMApp/BGMApp/BGMPlayThrough.cpp b/BGMApp/BGMApp/BGMPlayThrough.cpp
@@ -933,9 +933,8 @@ void    BGMPlayThrough::HandleBGMDeviceIsRunningSomewhereOtherThanBGMApp(BGMPlay
 // static
 bool    BGMPlayThrough::IsRunningSomewhereOtherThanBGMApp(const BGMAudioDevice& inBGMDevice)
 {
-    return CFBooleanGetValue(
-        static_cast<CFBooleanRef>(
-            inBGMDevice.GetPropertyData_CFType(kBGMRunningSomewhereOtherThanBGMAppAddress)));
+    auto type = inBGMDevice.GetPropertyData_CFType(kBGMRunningSomewhereOtherThanBGMAppAddress);
+    return type && CFBooleanGetValue(static_cast<CFBooleanRef>(type));
 }
 
 #pragma mark IOProcs

Original file line number	Diff line number	Diff line change
`@@ -933,9 +933,8 @@ void BGMPlayThrough::HandleBGMDeviceIsRunningSomewhereOtherThanBGMApp(BGMPlay`
`933`	`933`	`// static`
`934`	`934`	`bool BGMPlayThrough::IsRunningSomewhereOtherThanBGMApp(const BGMAudioDevice& inBGMDevice)`
`935`	`935`	`{`
`936`		`- return CFBooleanGetValue(`
`937`		`- static_cast<CFBooleanRef>(`
`938`		`- inBGMDevice.GetPropertyData_CFType(kBGMRunningSomewhereOtherThanBGMAppAddress)));`
	`936`	`+ auto type = inBGMDevice.GetPropertyData_CFType(kBGMRunningSomewhereOtherThanBGMAppAddress);`
	`937`	`+ return type && CFBooleanGetValue(static_cast<CFBooleanRef>(type));`
`939`	`938`	`}`
`940`	`939`
`941`	`940`	`#pragma mark IOProcs`