[pcgen-commit-svn] SF.net SVN: pcgen:[23592] Trunk/pcgen/code/src/java/pcgen/gui2/facade/ CharacterFacadeImpl.java

[<th...@us...>]

Revision: 23592
          http://sourceforge.net/p/pcgen/code/23592
Author:   thpr
Date:     2014-04-05 17:14:59 +0000 (Sat, 05 Apr 2014)
Log Message:
-----------
Fix: After one character is created and closed, creating further characters fails
Fix: Stack dump on creating new character
Issue#: CODE-2523, CODE-2544

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java

Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2014-04-05 07:39:42 UTC (rev 23591)
+++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2014-04-05 17:14:59 UTC (rev 23592)
@@ -204,6 +204,7 @@
 		HitPointListener 
 {
 
+	private static PlayerCharacter DUMMY_PC = new PlayerCharacter();
 	private List<ClassFacade> pcClasses;
 	private DefaultListFacade<TempBonusFacade> appliedTempBonuses;
 	private DefaultListFacade<TempBonusFacade> availTempBonuses;
@@ -316,7 +317,12 @@
 		GMBus.send(new PCClosedMessage(null, theCharacter));
 		Globals.getPCList().remove(theCharacter);
 		lastExportChar = null;
-		theCharacter = null;
+		/*
+		 * Unfortunately, a dummy rather than null is necessary because the UI
+		 * does model swaps and such that do not pause events in the UI so that
+		 * it is trying to update things that do not exist
+		 */
+		theCharacter = DUMMY_PC;
 		charDisplay = null;
 	}
 	

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.