fix(Windows): Automatically remove file when no audio has been written.

fixes #266
llfbandit · Dec 29, 2024 · f6bd26b · f6bd26b
1 parent 37548ed
commit f6bd26b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/record_windows/CHANGELOG.md b/record_windows/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 1.0.5
 * fix: Send messages on main thread (workaround).
+* fix: Automatically remove file when no audio has been written.
 
 ## 1.0.4
 * fix: Process path as wide string (UTF-16).

diff --git a/record_windows/windows/record.cpp b/record_windows/windows/record.cpp
@@ -185,6 +185,11 @@ namespace record_windows
 
 	HRESULT Recorder::Stop()
 	{
+		if (m_dataWritten == 0)
+		{
+			return Cancel();
+		}
+
 		HRESULT hr = EndRecording();
 
 		if (SUCCEEDED(hr))
@@ -195,6 +200,24 @@ namespace record_windows
 		return hr;
 	}
 
+	HRESULT Recorder::Cancel()
+	{
+		auto recordingPath = GetRecordingPath();
+		HRESULT hr = EndRecording();
+
+		if (SUCCEEDED(hr))
+		{
+			UpdateState(RecordState::stop);
+
+			if (!recordingPath.empty())
+			{
+				DeleteFile(recordingPath.c_str());
+			}
+		}
+
+		return hr;
+	}
+
 	bool Recorder::IsPaused()
 	{
 		switch (m_recordState)

diff --git a/record_windows/windows/record.h b/record_windows/windows/record.h
@@ -37,6 +37,7 @@ namespace record_windows
 		HRESULT Pause();
 		HRESULT Resume();
 		HRESULT Stop();
+		HRESULT Cancel();
 		bool IsPaused();
 		bool IsRecording();
 		HRESULT Dispose();

diff --git a/record_windows/windows/record_windows_plugin.cpp b/record_windows/windows/record_windows_plugin.cpp
@@ -214,18 +214,14 @@ namespace record_windows {
 		}
 		else if (method_call.method_name().compare("cancel") == 0)
 		{
-			auto recordingPath = recorder->GetRecordingPath();
-			HRESULT hr = recorder->Stop();
+			HRESULT hr = recorder->Cancel();
 
 			if (SUCCEEDED(hr))
 			{
-				if (!recordingPath.empty()) {
-					DeleteFile(recordingPath.c_str());
-				}
-
 				result->Success(EncodableValue());
 			}
-			else {
+			else
+			{
 				ErrorFromHR(hr, *result);
 			}
 		}