Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into pre-release
Browse files Browse the repository at this point in the history
  • Loading branch information
tillderoquefeuil committed Feb 7, 2024
2 parents e20f3a5 + a344c20 commit 27683b7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ certificate.p12
playwright.config.ts
* copy.*
*.wav
build-mac.sh
build-mac.sh
.idea
4 changes: 2 additions & 2 deletions src/render/src/components/setup/SettingsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const defaultSettings = (devices: AudioDeviceSettings[], scenes: Asset['scene'][
const autocamCam = autocamMic?.cams.find((a) => a.source.name === source.name)
camsSettings.push({
source,
weight: autocamCam?.weight? autocamCam?.weight : (l===m? 100 : 0)
weight: autocamCam?.weight === undefined ? (l===m? 100 : 0) : autocamCam?.weight
})
}
micsSettings.push({
Expand Down Expand Up @@ -364,4 +364,4 @@ table td .inputui-container {
}
</style>
</style>

0 comments on commit 27683b7

Please sign in to comment.