Fix conflicts

2022-03-25 16:53:18 +01:00
parent fac445a8fe 4f9d254c7e
commit 34d69b3b08
1 changed files with 18 additions and 16 deletions
@@ -55,10 +55,11 @@
            localUserStore.setMicrophonePrivacySettings(valueMicrophonePrivacySettings);
        }

+        audioManagerVolumeStore.setDecreaseWhileTalking(decreaseAudioPlayerVolumeWhileTalking);
+
        if (change) {
            window.location.reload();
        }
-    audioManagerVolumeStore.setDecreaseWhileTalking(decreaseAudioPlayerVolumeWhileTalking);

        closeMenu();
    }
@@ -100,13 +101,14 @@
        localUserStore.setIgnoreFollowRequests(ignoreFollowRequests);
    }

-  function closeMenu() {
-    menuVisiblilityStore.set(false);
-  }
    function changeDecreaseAudioPlayerVolumeWhileTalking() {
        localUserStore.setDecreaseAudioPlayerVolumeWhileTalking(decreaseAudioPlayerVolumeWhileTalking);
    }

+    function closeMenu() {
+        menuVisiblilityStore.set(false);
+    }
+
    const isMobile = isMediaBreakpointUp("md");
 </script>