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

2018-06-22 09:56:22 +00:00
parent a470f250b5 88ecaced82
commit 8eeff746d3
1 changed files with 2 additions and 0 deletions
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -913,6 +913,8 @@ module.exports = React.createClass({
    },

    uploadFile: async function(file) {
+        dis.dispatch({action: 'focus_composer'});
+
        if (MatrixClientPeg.get().isGuest()) {
            dis.dispatch({action: 'view_set_mxid'});
            return;