Merge pull request #575 from matrix-org/dbkr/udd_no_auto_show

Supporting fixes For making UnknownDeviceDialog not pop up automatically

src/client.js

@@ -1137,6 +1137,9 @@ function _sendEvent(client, room, event, callback) {
         try {
             _updatePendingEventStatus(room, event, EventStatus.NOT_SENT);
             event.error = err;
+            // also put the event object on the error: the caller will need this
+            // to resend or cancel the event
+            err.event = event;
 
             if (callback) {
                 callback(err);