Fixing crash when no audio mixer

SteffeyDev · Apr 12, 2020 · f94ff2f · f94ff2f
1 parent 795ee36
commit f94ff2f
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/atemOSC/AppDelegate.mm b/atemOSC/AppDelegate.mm
@@ -482,33 +482,33 @@ - (void)switcherConnected
 	if (SUCCEEDED(mSwitcher->QueryInterface(IID_IBMDSwitcherAudioMixer, (void**)&mAudioMixer)))
 	{
 		mAudioMixer->AddCallback(mAudioMixerMonitor);
-	}
-	else
-	{
-		[self logMessage:@"Could not get IBMDSwitcherAudioMixer interface"];
-	}
-
-	// Audio Inputs
-	IBMDSwitcherAudioInputIterator* audioInputIterator = NULL;
-	if (SUCCEEDED(mAudioMixer->CreateIterator(IID_IBMDSwitcherAudioInputIterator, (void**)&audioInputIterator)))
-	{
-		IBMDSwitcherAudioInput* audioInput = NULL;
-		while (S_OK == audioInputIterator->Next(&audioInput))
+
+		// Audio Inputs
+		IBMDSwitcherAudioInputIterator* audioInputIterator = NULL;
+		if (SUCCEEDED(mAudioMixer->CreateIterator(IID_IBMDSwitcherAudioInputIterator, (void**)&audioInputIterator)))
 		{
-			BMDSwitcherAudioInputId inputId;
-			audioInput->GetAudioInputId(&inputId);
-			mAudioInputs.insert(std::make_pair(inputId, audioInput));
-			AudioInputMonitor *monitor = new AudioInputMonitor(self, inputId);
-			audioInput->AddCallback(monitor);
-			mMonitors.push_back(monitor);
-			mAudioInputMonitors.insert(std::make_pair(inputId, monitor));
+			IBMDSwitcherAudioInput* audioInput = NULL;
+			while (S_OK == audioInputIterator->Next(&audioInput))
+			{
+				BMDSwitcherAudioInputId inputId;
+				audioInput->GetAudioInputId(&inputId);
+				mAudioInputs.insert(std::make_pair(inputId, audioInput));
+				AudioInputMonitor *monitor = new AudioInputMonitor(self, inputId);
+				audioInput->AddCallback(monitor);
+				mMonitors.push_back(monitor);
+				mAudioInputMonitors.insert(std::make_pair(inputId, monitor));
+			}
+			audioInputIterator->Release();
+			audioInputIterator = NULL;
+		}
+		else
+		{
+			[self logMessage:[NSString stringWithFormat:@"Could not create IBMDSwitcherAudioInputIterator iterator. code: %d", HRESULT_CODE(result)]];
 		}
-		audioInputIterator->Release();
-		audioInputIterator = NULL;
 	}
 	else
 	{
-		[self logMessage:[NSString stringWithFormat:@"Could not create IBMDSwitcherAudioInputIterator iterator. code: %d", HRESULT_CODE(result)]];
+		[self logMessage:@"Could not get IBMDSwitcherAudioMixer interface"];
 	}
 
 	// Hyperdeck Setup