Fix conflicts

This commit is contained in:
Benedicte Quimbert
2022-03-25 16:53:18 +01:00
@@ -55,10 +55,11 @@
localUserStore.setMicrophonePrivacySettings(valueMicrophonePrivacySettings); localUserStore.setMicrophonePrivacySettings(valueMicrophonePrivacySettings);
} }
audioManagerVolumeStore.setDecreaseWhileTalking(decreaseAudioPlayerVolumeWhileTalking);
if (change) { if (change) {
window.location.reload(); window.location.reload();
} }
audioManagerVolumeStore.setDecreaseWhileTalking(decreaseAudioPlayerVolumeWhileTalking);
closeMenu(); closeMenu();
} }
@@ -100,13 +101,14 @@
localUserStore.setIgnoreFollowRequests(ignoreFollowRequests); localUserStore.setIgnoreFollowRequests(ignoreFollowRequests);
} }
function closeMenu() {
menuVisiblilityStore.set(false);
}
function changeDecreaseAudioPlayerVolumeWhileTalking() { function changeDecreaseAudioPlayerVolumeWhileTalking() {
localUserStore.setDecreaseAudioPlayerVolumeWhileTalking(decreaseAudioPlayerVolumeWhileTalking); localUserStore.setDecreaseAudioPlayerVolumeWhileTalking(decreaseAudioPlayerVolumeWhileTalking);
} }
function closeMenu() {
menuVisiblilityStore.set(false);
}
const isMobile = isMediaBreakpointUp("md"); const isMobile = isMediaBreakpointUp("md");
</script> </script>