Просмотр исходного кода

Fix bugs in code ordering/missing unsubscribe

Sam Jaffe 8 лет назад
Родитель
Сommit
2879c1b8a1

+ 2 - 1
src/main/lombok/org/leumasjaffe/charsheet/view/skills/SkillLevelUpPanel.java

@@ -128,15 +128,16 @@ public abstract class SkillLevelUpPanel extends JPanel {
 	protected abstract void setIsReady(boolean b);
 	
 	public void commitAllChanges() {
+		lines.values().forEach(SkillLevelUpLine::applyChange);
 		skills.getSkills().stream().filter(
 				sk -> sk.isFromWildcardSkill() && sk.getPointsSpent() == 0)
 		.collect(Collectors.toList()).forEach(skills::removeSkill);
-		lines.values().forEach(SkillLevelUpLine::applyChange);
 	}
 	
 	@Override
 	public void removeNotify() {
 		super.removeNotify();
+		ObserverDispatch.unsubscribeAll(listener);
 		ObserverDispatch.unsubscribeAll(purchaseListener);
 	}
 }