[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1553
Date       : Wed Jul 26 15:00:58 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/attrappl.cpp

Small tweak for safety.


Diff:
Index: Trunk/XaraLX/Kernel/attrappl.cpp
===================================================================
--- Trunk/XaraLX/Kernel/attrappl.cpp	(revision 1552)
+++ Trunk/XaraLX/Kernel/attrappl.cpp	(revision 1553)
@@ -278,9 +278,10 @@
 	// NOTE! Better to get the value of this flag here, now that GetObjectToApplyTo has been called
 	BOOL bEffectRootOnly = (CurrentNode->IsAnObject() && ((NodeRenderableInk*)CurrentNode)->IsValidEffectAttr(Attrib));
 
-	// If we are applying attributes to the Caret only the caller should not retain an undo record
+	// If we are applying attributes to the Caret alone then the caller should not retain an undo record
 	// for this operation...
-	*pbCanDiscardUndo = *pbCanDiscardUndo && CurrentNode->DiscardsAttributeChildren();
+	if (pbCanDiscardUndo)
+		*pbCanDiscardUndo = *pbCanDiscardUndo && CurrentNode->DiscardsAttributeChildren();
 
 	// BODGE! ------------------------------------------------------------
 	// Don't apply stroke transparency as an effect attribute - nothing


Xara