Merge branch 'master' into user_persistance

thedangler · Feb 19, 2012 · 16bb938 · 16bb938
2 parents 6d00e36 + 6f796da
commit 16bb938
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/assets/js/client.js b/assets/js/client.js
@@ -108,6 +108,7 @@ $(function() {
       irc.chatWindows.add({name: data.nick, type: 'pm'})
         .trigger('forMe', 'newPm');
       chatWindow = irc.chatWindows.getByName(data.nick);
+      irc.chatWindows.setActive(chatWindow);
     }
     chatWindow.stream.add({sender: data.nick, raw: data.text, type: 'pm'});
   });