[*] update normally

Author: heng30

lib/recorder/src/recorder.rs

@@ -850,7 +850,7 @@ impl RecordingSession {
                 stop_sig: self.stop_sig_combine,
             };
 
-            combine_tracks(combine_config, combine_progress_cb)?;
+            let combine_tracks_state = combine_tracks(combine_config, combine_progress_cb)?;
 
             if tmp_output_file.exists() {
                 _ = fs::rename(&tmp_output_file, &self.config.output_path);
@@ -862,10 +862,12 @@ impl RecordingSession {
                     self.config.output_path.display(),
                 );
             } else {
-                return Err(RecorderError::Ffmpeg(format!(
-                    "Save recorded file: {} failed. Something wrong with ffmpeg operation",
-                    self.config.output_path.display()
-                )));
+                if combine_tracks_state == ProgressState::Finished {
+                    return Err(RecorderError::Ffmpeg(format!(
+                        "Save recorded file: {} failed. Something wrong with ffmpeg operation",
+                        self.config.output_path.display()
+                    )));
+                }
             }
 
             if self.config.remove_cache_files && self.config.output_path.exists() {

wayshot/ui/panel/desktop/home.slint

@@ -434,7 +434,7 @@ component Banners inherits VerticalLayout {
         HorizontalLayout {
             Label {
                 color: Theme.light-text-color;
-                text: Store.merge-tracks-status == MergeTrackStatus.Finished ? (Logic.tr("Merging tracks successfully!") + " " + Logic.tr("Output file") + ": " + Store.final-video-path) : Logic.tr("Merging tracks failed");
+                text: Store.merge-tracks-status == MergeTrackStatus.Finished ? (Logic.tr("Merging tracks successfully") + "! " + Logic.tr("Output file") + ": " + Store.final-video-path) : Logic.tr("Merging tracks failed");
                 font-weight: Theme.bold-font-weight;
             }
         }