|
@@ -300,7 +300,7 @@ public class Model implements PropertyChangeListener{
|
300
|
300
|
this.support.firePropertyChange("pseudoRefused", this.user.getPseudo(), this.ancienPseudo);
|
301
|
301
|
}
|
302
|
302
|
synchronized (userList) {
|
303
|
|
- if (!this.userList.contains(newUser)) {
|
|
303
|
+ if ((!this.userList.contains(newUser)) && (!newUser.equals(this.user))) {
|
304
|
304
|
this.userList.add(newUser);
|
305
|
305
|
Collections.sort(this.userList);
|
306
|
306
|
this.support.firePropertyChange("newUserConnected", -1, -2);
|
|
@@ -664,7 +664,9 @@ public class Model implements PropertyChangeListener{
|
664
|
664
|
}
|
665
|
665
|
userList.removeAll(userListToRemove);
|
666
|
666
|
servUserList.removeAll(userListWatched);
|
667
|
|
- servUserList.remove(user);
|
|
667
|
+ if (servUserList.remove(user)) {
|
|
668
|
+ System.out.println(("\n\nUSER SUPP\n\n"));
|
|
669
|
+ }
|
668
|
670
|
userListToAdd.addAll(servUserList);
|
669
|
671
|
userList.addAll(userListToAdd);
|
670
|
672
|
} else {
|