Permalink
Browse files

Merged master with 024_release

  • Loading branch information...
2 parents 2fc8c37 + 9d5aaba commit 8de7881f61b82482ffe3467cb199e3deb32550a8 @eirikb eirikb committed Mar 11, 2013
View
@@ -285,7 +285,9 @@ $(function() {
});
irc.socket.on('netError', function(data) {
- irc.appView.showError('Invalid server');
+ if(!$('.alert-error').length) {
+ irc.appView.showError('Invalid server');
+ }
});
irc.socket.on('login_error', function(data) {
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 8de7881

Please sign in to comment.