Commit ae58e3d1 authored by JC Brand's avatar JC Brand

Merge branch 'master' into mam

parents a0d344c7 1766aa75
...@@ -5858,7 +5858,8 @@ ...@@ -5858,7 +5858,8 @@
} catch (e) { } catch (e) {
converse.log("Could not restore sessions. Error message: "+e.message); converse.log("Could not restore sessions. Error message: "+e.message);
} }
} else if (this.auto_login) { }
if (this.auto_login) {
if (!this.jid) { if (!this.jid) {
throw new Error("initConnection: If you use auto_login, you also need to provide a jid value"); throw new Error("initConnection: If you use auto_login, you also need to provide a jid value");
} }
......
Changelog Changelog
========= =========
0.9.5 (Unreleased)
------------------
* #439 auto_login and keepalive not working [jcbrand]
0.9.4 (2015-07-04) 0.9.4 (2015-07-04)
------------------ ------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment