[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1106
Date       : Wed May 17 15:34:00 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/grndbmp.cpp
   M /Trunk/XaraLX/wxOil/grnddib.cpp

Fixed logic errors in Banding ENSUREs.
Fixes BZ1019


Diff:
Index: Trunk/XaraLX/wxOil/grnddib.cpp
===================================================================
--- Trunk/XaraLX/wxOil/grnddib.cpp	(revision 1105)
+++ Trunk/XaraLX/wxOil/grnddib.cpp	(revision 1106)
@@ -412,7 +412,8 @@
 	if (IsBanded() || pBitmapInfo!=NULL)
 		return TRUE;
 
-	ENSURE(GetCaptureDepth()==0, "Can't set a band while there are any captures running");
+//	ENSURE(GetCaptureDepth()==0, "Can't set a band while there are any captures running");
+	ENSURE(GetCaptureDepth()==0 || MasterCaptureIsCurrent(), "Can't set a band while there are any non-master captures running
");
 
 	// They can be merged for the time being
 	CanRegionBeMerged = TRUE;
@@ -524,7 +525,8 @@
 	if (!IsBanded())
 		return FALSE;
 
-	ENSURE(GetCaptureDepth()==0, "Can't set a band while there are any captures running");
+//	ENSURE(GetCaptureDepth()==0, "Can't set a band while there are any captures running");
+	ENSURE(GetCaptureDepth()==0 || MasterCaptureIsCurrent(), "Can't set a band while there are any non-master captures running
");
 
 	// ensure all offscreen rendering in previous band finished rendering
 	// NB if it didn't then GetNextBand shouldn't have been called.
Index: Trunk/XaraLX/wxOil/grndbmp.cpp
===================================================================
--- Trunk/XaraLX/wxOil/grndbmp.cpp	(revision 1105)
+++ Trunk/XaraLX/wxOil/grndbmp.cpp	(revision 1106)
@@ -628,7 +628,8 @@
 		pBits = NULL;
 	}
 
-	ENSURE(GetCaptureDepth()==0, "Can't set a band while there are any captures running");
+//	ENSURE(GetCaptureDepth()==0, "Can't set a band while there are any captures running");
+	ENSURE(GetCaptureDepth()==0 || MasterCaptureIsCurrent(), "Can't set a band while there are any non-master captures running
");
 
 	// if this is not a banded render region, then there are no more bands
 	if (!IsBanded())


Xara