feat: check geometry file for undefined

olzzon · Jan 28, 2020 · b15fbb1 · b15fbb1
1 parent 6cda7c0
commit b15fbb1
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/server/utils/mixerConnections/CasparCGConnection.ts b/server/utils/mixerConnections/CasparCGConnection.ts
@@ -61,7 +61,7 @@ export class CasparCGConnection {
     injectCasparCGSetting() {
         const geometryFile = path.join('storage', 'default-casparcg.ccg');
 
-        let geometry: ICasparCGMixerGeometryFile | undefined = undefined
+        let geometry: ICasparCGMixerGeometryFile | undefined
         try {
             let inputObj = JSON.parse(fs.readFileSync(geometryFile, {
                 encoding: 'utf-8'
@@ -73,11 +73,12 @@ export class CasparCGConnection {
             // Handling a file should be removed from Constants in the future:
             console.log('CasparCG Audio geometry file has not been created')
         }
-
-        this.mixerProtocol.fromMixer = geometry.fromMixer
-		this.mixerProtocol.toMixer = geometry.toMixer
-		this.mixerProtocol.channelLabels = geometry.channelLabels
-        this.mixerProtocol.sourceOptions = geometry.sourceOptions
+        if (geometry) {
+            this.mixerProtocol.fromMixer = geometry.fromMixer || this.mixerProtocol.fromMixer 
+            this.mixerProtocol.toMixer = geometry.toMixer || this.mixerProtocol.toMixer
+            this.mixerProtocol.channelLabels = geometry.channelLabels || this.mixerProtocol.channelLabels
+            this.mixerProtocol.sourceOptions = geometry.sourceOptions || this.mixerProtocol.sourceOptions
+        }
     }
 
     setupMixerConnection() {