Merge pull request #4506 from traPtitech/fix/mute_on_dm_view

DM開いてるときに音が聞こえなくなる問題を修正
traPtitech · Jan 28, 2025 · 2ac6622 · 2ac6622
2 parents 46bb9c6 + 9cd4136
commit 2ac6622
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/components/Main/MainView/ChannelView/ChannelView.vue b/src/components/Main/MainView/ChannelView/ChannelView.vue
@@ -4,7 +4,6 @@
       <channel-header :channel-id="channelId" />
     </template>
     <template #default>
-      <QallAudio />
       <QallView v-if="getQallingState(channelId) === 'mainView'" />
       <channel-view-content
         v-else
@@ -37,7 +36,6 @@ import usePinnedMessages from '/@/composables/message/usePinnedMessages'
 import useCurrentViewers from '/@/composables/useCurrentViewers'
 import { useQall } from '/@/composables/qall/useQall'
 import QallView from '../QallView/QallView.vue'
-import QallAudio from '../QallView/QallAudio.vue'
 
 const props = defineProps<{
   isReady: boolean

diff --git a/src/components/Main/MainView/MainView.vue b/src/components/Main/MainView/MainView.vue
@@ -11,6 +11,8 @@
     </div>
     <div id="header" :class="$style.headerContainer"></div>
     <div :class="$style.layoutContainer" :data-layout="layout">
+      <QallAudio />
+
       <primary-view-selector :is-ready="isMounted" />
       <div id="sidebar-opener" :class="$style.hidden" />
       <secondary-view-selector v-if="layout !== 'single'" />
@@ -24,6 +26,7 @@ import { useMainViewStore } from '/@/store/ui/mainView'
 import PrimaryViewSelector from './PrimaryViewSelector.vue'
 import SecondaryViewSelector from './SecondaryViewSelector.vue'
 import { isIOSApp } from '/@/lib/dom/browser'
+import QallAudio from './QallView/QallAudio.vue'
 
 const iosAppFlag = isIOSApp(window)
 const iosAppDeprecatedMessage =