From c4530be148cdc10ec9b21158e0f550de379ac5e3 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Fri, 12 Jun 2015 21:47:43 -0700
Subject: [PATCH] Fix volume control in gallery overriding zoom in/out by
 control+wheel.

---
 src/Images/Volume.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Images/Volume.coffee b/src/Images/Volume.coffee
index 5583b6299..b4248a77f 100644
--- a/src/Images/Volume.coffee
+++ b/src/Images/Volume.coffee
@@ -70,6 +70,7 @@ Volume =
     $.on @nodes.thumb, 'wheel', Volume.wheel.bind(Header.hover)
 
   wheel: (e) ->
+    return if e.shiftKey or e.altKey or e.ctrlKey or e.metaKey
     return unless el = $ 'video:not([data-md5])', @
     return if el.muted or not $.hasAudio el
     volume = el.volume + 0.1