From 89fbc5449e0b7d0b54f5ed76cd49ca12c1f6067a Mon Sep 17 00:00:00 2001 From: derrod Date: Sun, 24 Feb 2019 05:12:37 +0100 Subject: [PATCH] UI: Show video container warning when selecting MOV MOV and MP4 are closely related and the warning message applies to both of these container formats. Closes #1683 --- UI/data/locale/en-US.ini | 2 +- UI/window-basic-settings.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini index 121431672..d1b3fdecf 100644 --- a/UI/data/locale/en-US.ini +++ b/UI/data/locale/en-US.ini @@ -876,7 +876,7 @@ SceneItemHide="Hide '%1'" # Output warnings OutputWarnings.NoTracksSelected="You must select at least one track" OutputWarnings.MultiTrackRecording="Warning: Certain formats (such as FLV) do not support multiple tracks per recording" -OutputWarnings.MP4Recording="Warning: Recordings saved to MP4 will be unrecoverable if the file cannot be finalized (e.g. as a result of BSODs, power losses, etc.). If you want to record multiple audio tracks consider using MKV and remux the recording to mp4 after it is finished (File->Remux Recordings)" +OutputWarnings.MP4Recording="Warning: Recordings saved to MP4/MOV will be unrecoverable if the file cannot be finalized (e.g. as a result of BSODs, power losses, etc.). If you want to record multiple audio tracks consider using MKV and remux the recording to MP4/MOV after it is finished (File->Remux Recordings)" # deleting final scene FinalScene.Title="Delete Scene" diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 4bcfdf282..7293ef441 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -3888,7 +3888,8 @@ void OBSBasicSettings::AdvOutRecCheckWarnings() warningMsg = QTStr("OutputWarnings.MultiTrackRecording"); } - if (ui->advOutRecFormat->currentText().compare("mp4") == 0) { + if (ui->advOutRecFormat->currentText().compare("mp4") == 0 || + ui->advOutRecFormat->currentText().compare("mov") == 0) { if (!warningMsg.isEmpty()) warningMsg += "\n\n"; warningMsg += QTStr("OutputWarnings.MP4Recording"); @@ -4347,7 +4348,8 @@ void OBSBasicSettings::SimpleRecordingEncoderChanged() } } - if (ui->simpleOutRecFormat->currentText().compare("mp4") == 0) { + if (ui->simpleOutRecFormat->currentText().compare("mp4") == 0 || + ui->simpleOutRecFormat->currentText().compare("mov") == 0) { if (!warning.isEmpty()) warning += "\n\n"; warning += QTStr("OutputWarnings.MP4Recording");