Permalink
Browse files

Merge pull request #222 from eirikb/master-024_release

Merge 024_release with master
  • Loading branch information...
2 parents 2fc8c37 + 8de7881 commit 9673b12b3d9211ff5ab5a33bfa957a447856f983 @thedjpetersen 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) {

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 9673b12

Please sign in to comment.