diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-12-15 14:44:46 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-12-15 14:44:46 +0100 |
| commit | dc1dd2e857114fac2462f18ea774ddacb287fa81 (patch) | |
| tree | 32b701de50c505abc95ceddc7c429df85c81f041 /src/components/services/tabs/TabItem.js | |
| parent | Remove IME handlers (diff) | |
| parent | Merge pull request #475 from meetfranz/feature/service-improvements (diff) | |
| download | ferdium-app-dc1dd2e857114fac2462f18ea774ddacb287fa81.tar.gz ferdium-app-dc1dd2e857114fac2462f18ea774ddacb287fa81.tar.zst ferdium-app-dc1dd2e857114fac2462f18ea774ddacb287fa81.zip | |
Merge branch 'develop' into feature/macOS-copy-paste
Diffstat (limited to 'src/components/services/tabs/TabItem.js')
| -rw-r--r-- | src/components/services/tabs/TabItem.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 8403d9462..7aed8fda7 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
| @@ -126,7 +126,7 @@ class TabItem extends Component { | |||
| 126 | const menu = Menu.buildFromTemplate(menuTemplate); | 126 | const menu = Menu.buildFromTemplate(menuTemplate); |
| 127 | 127 | ||
| 128 | let notificationBadge = null; | 128 | let notificationBadge = null; |
| 129 | if ((showMessageBadgeWhenMutedSetting || service.isNotificationEnabled) && showMessageBadgesEvenWhenMuted) { | 129 | if ((showMessageBadgeWhenMutedSetting || service.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && service.isBadgeEnabled) { |
| 130 | notificationBadge = ( | 130 | notificationBadge = ( |
| 131 | <span> | 131 | <span> |
| 132 | {service.unreadDirectMessageCount > 0 && ( | 132 | {service.unreadDirectMessageCount > 0 && ( |