diff options
author | 2019-10-09 09:48:41 +0200 | |
---|---|---|
committer | 2019-10-09 09:48:41 +0200 | |
commit | da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af (patch) | |
tree | a189f4566c6380b86aeb04b9307aea23fc6e14d7 /src/stores | |
parent | Update zh-HANT.json (diff) | |
parent | Update CHANGELOG.md (diff) | |
download | ferdium-app-da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af.tar.gz ferdium-app-da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af.tar.zst ferdium-app-da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af.zip |
Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.4.0
Diffstat (limited to 'src/stores')
-rw-r--r-- | src/stores/ServicesStore.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 3173004d4..076ecc204 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -370,6 +370,7 @@ export default class ServicesStore extends Store { | |||
370 | service.initializeWebViewEvents({ | 370 | service.initializeWebViewEvents({ |
371 | handleIPCMessage: this.actions.service.handleIPCMessage, | 371 | handleIPCMessage: this.actions.service.handleIPCMessage, |
372 | openWindow: this.actions.service.openWindow, | 372 | openWindow: this.actions.service.openWindow, |
373 | stores: this.stores, | ||
373 | }); | 374 | }); |
374 | service.initializeWebViewListener(); | 375 | service.initializeWebViewListener(); |
375 | } | 376 | } |
@@ -727,6 +728,8 @@ export default class ServicesStore extends Store { | |||
727 | const serviceData = data; | 728 | const serviceData = data; |
728 | const recipe = this.stores.recipes.one(recipeId); | 729 | const recipe = this.stores.recipes.one(recipeId); |
729 | 730 | ||
731 | if (!recipe) return; | ||
732 | |||
730 | if (recipe.hasTeamId && recipe.hasCustomUrl && data.team && data.customUrl) { | 733 | if (recipe.hasTeamId && recipe.hasCustomUrl && data.team && data.customUrl) { |
731 | delete serviceData.team; | 734 | delete serviceData.team; |
732 | } | 735 | } |