diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-11-10 16:16:51 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2017-11-10 16:16:51 +0100 |
| commit | cdb9d5686841d82c5dd0623f223de55dd0fc94d0 (patch) | |
| tree | b6a8fb58a59ef3387e555690d2e83817b95033c7 /src/components/services/tabs | |
| parent | Merge branch 'develop' into feature/mute-service (diff) | |
| download | ferdium-app-cdb9d5686841d82c5dd0623f223de55dd0fc94d0.tar.gz ferdium-app-cdb9d5686841d82c5dd0623f223de55dd0fc94d0.tar.zst ferdium-app-cdb9d5686841d82c5dd0623f223de55dd0fc94d0.zip | |
fix merging issues
Diffstat (limited to 'src/components/services/tabs')
| -rw-r--r-- | src/components/services/tabs/TabItem.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 4a37bad57..a7136c43f 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
| @@ -111,8 +111,8 @@ class TabItem extends Component { | |||
| 111 | : intl.formatMessage(messages.disableAudio), | 111 | : intl.formatMessage(messages.disableAudio), |
| 112 | click: () => toggleAudio(), | 112 | click: () => toggleAudio(), |
| 113 | }, { | 113 | }, { |
| 114 | label: intl.formatMessage(messages.disableService), | 114 | label: intl.formatMessage(service.isEnabled ? messages.disableService : messages.enableService), |
| 115 | click: () => disableService(), | 115 | click: () => (service.isEnabled ? disableService() : enableService()), |
| 116 | }, { | 116 | }, { |
| 117 | type: 'separator', | 117 | type: 'separator', |
| 118 | }, { | 118 | }, { |