Skip to content

Fix #1083: free CJamRecorder if Init() fails #3838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcfnord wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −0
Open

Fix #1083: free CJamRecorder if Init() fails #3838

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cd7eef
Fix #1083: free CJamRecorder if Init() fails
Jul 27, 2026
203bb60
Apply clang-format: space before trailing comments in SetRecordingDir…
Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/recorder/jamcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ void CJamController::SetRecordingDir ( QString newRecordingDir, int iServerFrame
bRecorderInitialised = ( strRecorderErrMsg == QString() );
bEnableRecording = bRecorderInitialised && !bDisableRecording;

if ( !bRecorderInitialised )

@pljones pljones Jul 27, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So pJamRecorder = new recorder::CJamRecorder(...) never throws, leaving it to pJamRecorder->Init() to return an error (or empty) string tidily (I vaguely remember it). Thus we only enter here if the was an error.

{
delete pJamRecorder; // Init() failed: never moved to thread / never
pJamRecorder = nullptr; // wired to deleteLater, so free it here (#1083)
}

qInfo() << qUtf8Printable ( QString ( "Recording state: %1" ).arg ( bEnableRecording ? "enabled" : "disabled" ) );
}
else
Expand Down
Loading