Fix for #310 : Null Pointer Exception on DisplayRecordingSource.MainM…

…onitor
sskodje · Aug 11, 2024 · 8ae3b75 · 8ae3b75
1 parent fe00a9e
commit 8ae3b75
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/ScreenRecorderLib/RecordingSources.h b/ScreenRecorderLib/RecordingSources.h
@@ -199,15 +199,23 @@ namespace ScreenRecorderLib {
 		bool _isBorderRequired = true;
 		String^ _deviceName;
 	public:
+		/// <summary>
+		/// Returns a recording source for the main display output. If no display output is available, it returns NULL.
+		/// </summary>
 		static property DisplayRecordingSource^ MainMonitor {
 			DisplayRecordingSource^ get() {
 				DisplayRecordingSource^ source = gcnew DisplayRecordingSource();
 				IDXGIOutput* output;
-				GetMainOutput(&output);
-				DXGI_OUTPUT_DESC outputDesc;
-				output->GetDesc(&outputDesc);
-				source->DeviceName = gcnew String(outputDesc.DeviceName);
-				return source;
+				HRESULT hr = GetMainOutput(&output);
+				if (SUCCEEDED(hr)) {
+					DXGI_OUTPUT_DESC outputDesc;
+					output->GetDesc(&outputDesc);
+					source->DeviceName = gcnew String(outputDesc.DeviceName);
+					return source;
+				}
+				else {
+					return nullptr;
+				}
 			}
 		}
 		/// <summary>

diff --git a/ScreenRecorderLibNative/DX.util.cpp b/ScreenRecorderLibNative/DX.util.cpp
@@ -278,7 +278,7 @@ HRESULT GetOutputRectsForRecordingSources(_In_ const std::vector<RECORDING_SOURC
 }
 
 HRESULT GetMainOutput(_Outptr_result_maybenull_ IDXGIOutput **ppOutput) {
-	HRESULT hr = S_FALSE;
+	HRESULT hr = DXGI_ERROR_NOT_FOUND;
 	if (ppOutput) {
 		*ppOutput = nullptr;
 	}