Merge remote-tracking branch 'origin/develop' into develop

src/renderer/less/bootstrap.less

@@ -7605,6 +7605,9 @@ fieldset:disabled .btn {
   text-align      : center;
   background-color: #000;
   border-radius   : 0.25rem;
+  -webkit-user-select: none;
+  user-select: none;
+  pointer-events: none;
 }
 
 .popover {
@@ -7763,4 +7766,4 @@ fieldset:disabled .btn {
 .popover-body {
   padding: 1rem 1rem;
   color  : #212529;
-}
+}

src/renderer/main/vueapp.js

@@ -3533,7 +3533,7 @@ const app = new Vue({
             return event.deltaY < 0;
         },
         volumeUp() {
-            if ((app.mk.volume + app.cfg.audio.volumeStep) > 1) {
+            if ((app.mk.volume + app.cfg.audio.volumeStep) > app.cfg.audio.maxVolume) {
                 app.mk.volume = app.cfg.audio.maxVolume;
                 console.log('setting max volume')
             } else {