client/components/widgets/EncoderOptionsCard.vue

@@ -143,18 +143,10 @@ export default {
       localStorage.setItem('embedMetadataCodec', val)
     },
     getEncodingOptions() {
-      if (this.showAdvancedView) {
+      return {
-        return {
+        codec: this.selectedCodec || 'aac',
-          codec: this.customCodec || this.selectedCodec || 'aac',
+        bitrate: this.selectedBitrate || '128k',
-          bitrate: this.customBitrate || this.selectedBitrate || '128k',
+        channels: this.selectedChannels || 2
-          channels: this.customChannels || this.selectedChannels || 2
-        }
-      } else {
-        return {
-          codec: this.selectedCodec || 'aac',
-          bitrate: this.selectedBitrate || '128k',
-          channels: this.selectedChannels || 2
-        }
       }
     },
     setPreset() {

client/pages/audiobook/_id/manage.vue

@@ -356,8 +356,6 @@ export default {
 
       const encodeOptions = this.$refs.encoderOptionsCard.getEncodingOptions()
 
-      this.encodingOptions = encodeOptions
-
       const queryParams = new URLSearchParams(encodeOptions)
 
       this.processing = true

server/managers/AbMergeManager.js

@@ -203,15 +203,7 @@ class AbMergeManager {
     // Move library item tracks to cache
     for (const [index, trackPath] of task.data.originalTrackPaths.entries()) {
       const trackFilename = Path.basename(trackPath)
-      let moveToPath = Path.join(task.data.itemCachePath, trackFilename)
+      const moveToPath = Path.join(task.data.itemCachePath, trackFilename)
-
-      // If the track is the same as the temp file, we need to rename it to avoid overwriting it
-      if (task.data.tempFilepath === moveToPath) {
-        const trackExtname = Path.extname(task.data.tempFilepath)
-        const newTrackFilename = Path.basename(task.data.tempFilepath, trackExtname) + '.backup' + trackExtname
-        moveToPath = Path.join(task.data.itemCachePath, newTrackFilename)
-      }
-
       Logger.debug(`[AbMergeManager] Backing up original track "${trackPath}" to ${moveToPath}`)
       if (index === 0) {
         // copy the first track to the cache directory