Skip to content

Commit af2673a

Browse files
committed
Merge branch 'main' into pr/1771
2 parents 9dcd940 + 38506f8 commit af2673a

24 files changed

Lines changed: 2369 additions & 170 deletions

File tree

apps/desktop/src-tauri/src/export.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,10 @@ async fn run_out_of_process_export_attempt(
298298
}
299299

300300
if mode.is_software_safe() {
301-
command
302-
.env("CAP_RENDER_FORCE_SOFTWARE_ADAPTER", "1")
303-
.env("CAP_EXPORT_FORCE_SOFTWARE_ENCODER", "1");
301+
command.env("CAP_EXPORT_FORCE_SOFTWARE_ENCODER", "1");
302+
if cfg!(windows) {
303+
command.env("CAP_RENDER_FORCE_SOFTWARE_ADAPTER", "1");
304+
}
304305
}
305306
configure_exporter_command(&mut command);
306307

0 commit comments

Comments
 (0)