Merge branch 'master' of github.com:mitmproxy/mitmproxy into list

2 files changed, 2 insertions, 2 deletions

diff --git a/web/src/js/connection.js b/web/src/js/connection.js
index 38440a68..6292cd57 100644
--- a/web/src/js/connection.js
+++ b/web/src/js/connection.js
@@ -31,7 +31,7 @@ export default function Connection(url, dispatch) {
             case flowActions.WS_MSG_TYPE:
                 return dispatch(flowActions.handleWsMsg(message))
             case settingsActions.UPDATE_SETTINGS:
-                return dispatch(settingsActions.updateSettings(message))
+                return dispatch(settingsActions.handleWsMsg(message))
             default:
                 console.warn("unknown message", message)
         }
diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js
index 3e6c8366..bef7c0ff 100644
--- a/web/src/js/ducks/settings.js
+++ b/web/src/js/ducks/settings.js
@@ -47,7 +47,7 @@ export default function reducer(state = defaultState, action) {
     }
 }
 
-export function updateSettings(event) {
+export function handleWsMsg(event) {
     /* This action creator takes all WebSocket events */
     if (event.cmd === 'update') {
         return {