Skip to content

fix: release write lock before showing blocking error dialog #1637

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
chindris-mihai-alexandru wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: release write lock before showing blocking error dialog #1637

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
163e51c
fix: release write lock before showing blocking error dialog
Feb 28, 2026
7beab87
fix: reuse error string in recording failure path
Feb 28, 2026
1defd58
Update apps/desktop/src-tauri/src/recording.rs
chindris-mihai-alexandru Feb 28, 2026
60389f1
Update apps/desktop/src-tauri/src/recording.rs
chindris-mihai-alexandru Feb 28, 2026
ec8b06b
fix: prefer main window for recording error dialog parent
Feb 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
28 changes: 19 additions & 9 deletions apps/desktop/src-tauri/src/recording.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,29 +1057,39 @@ pub async fn start_recording(
let _ = RecordingEvent::Stopped.emit(&app);
}
Err(e) => {
let mut state = state_mtx.write().await;

let error = e.to_string();
let _ = RecordingEvent::Failed {
Copy link

@tembo tembo bot Feb 28, 2026

Choose a reason for hiding this comment

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

Minor cleanup: e.to_string() is computed 3x here; consider computing it once and reusing it (also keeps the error message consistent across event/state cleanup/dialog).

Suggested change
let _ = RecordingEvent::Failed {
Err(e) => {
let error = e.to_string();
let _ = RecordingEvent::Failed {
error: error.clone(),
}
.emit(&app);
{
let mut state = state_mtx.write().await;
let _ = handle_recording_end(
app.clone(),
Err(error.clone()),
&mut state,
project_file_path,
)
.await;
}
let mut dialog = MessageDialogBuilder::new(
app.dialog().clone(),
"An error occurred".to_string(),
error,
)
.kind(tauri_plugin_dialog::MessageDialogKind::Error);

Copy link
Author

@chindris-mihai-alexandru chindris-mihai-alexandru Feb 28, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

Applied in 7beab87. I now compute the error string once and reuse it for the failed event payload, cleanup path, and dialog message.

error: e.to_string(),
error: error.clone(),
}
.emit(&app);

{
let mut state = state_mtx.write().await;
handle_recording_end(
app.clone(),
Err(error.clone()),
&mut state,
project_file_path,
)
.await
.ok();
}

let mut dialog = MessageDialogBuilder::new(
app.dialog().clone(),
"An error occurred".to_string(),
e.to_string(),
error,
)
.kind(tauri_plugin_dialog::MessageDialogKind::Error);

if let Some(window) = CapWindowId::RecordingControls.get(&app) {
if let Some(window) = CapWindowId::Main
.get(&app)
.or_else(|| CapWindowId::RecordingControls.get(&app))
{
dialog = dialog.parent(&window);
}

dialog.blocking_show();

handle_recording_end(app, Err(e.to_string()), &mut state, project_file_path)
.await
.ok();
}
}
}
Expand Down