Merge branch 'develop' of https://github.com/getferdi/ferdi into develop

3 files changed, 9 insertions, 7 deletions

diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index fa34ac60b..89c82c7f8 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -169,7 +169,7 @@ export default @observer class EditServiceForm extends Component {
         if (recipe.validateUrl && values.customUrl) {
           this.setState({ isValidatingCustomUrl: true });
           try {
-            values.customUrl = normalizeUrl(values.customUrl, { stripWWW: false });
+            values.customUrl = normalizeUrl(values.customUrl, { stripWWW: false, removeTrailingSlash: false });
             isValid = await recipe.validateUrl(values.customUrl);
           } catch (err) {
             console.warn('ValidateURL', err);
diff --git a/src/models/Service.js b/src/models/Service.js
index 10b54602f..12a2d4af9 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -1,6 +1,6 @@
-import { computed, observable, autorun } from 'mobx';
-import path from 'path';
+import { autorun, computed, observable } from 'mobx';
 import normalizeUrl from 'normalize-url';
+import path from 'path';
 
 const debug = require('debug')('Ferdi:Service');
 
@@ -146,7 +146,7 @@ export default class Service {
     if (this.recipe.hasCustomUrl && this.customUrl) {
       let url;
       try {
-        url = normalizeUrl(this.customUrl, { stripWWW: false });
+        url = normalizeUrl(this.customUrl, { stripWWW: false, removeTrailingSlash: false });
       } catch (err) {
         console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`);
       }
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 8a5ee7204..428b6342c 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -47,9 +47,11 @@ export default class SettingsStore extends Store {
 
     reaction(
       () => this.all.app.autohideMenuBar,
-      () => remote.getCurrentWindow().setAutoHideMenuBar(
-        this.all.app.autohideMenuBar,
-      ),
+      () => {
+        const currentWindow = remote.getCurrentWindow();
+        currentWindow.setMenuBarVisibility(!this.all.app.autohideMenuBar);
+        currentWindow.setAutoHideMenuBar(this.all.app.autohideMenuBar);
+      },
     );
 
     reaction(