[dasher] OneStepTowards clears goto queue - improves handling of CStylusFilter.



commit 8d5ad71b8cdebb5493a8bc96f92aedb4e95b837f
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Sat Aug 15 17:43:07 2009 +0200

    OneStepTowards clears goto queue - improves handling of CStylusFilter.

 ChangeLog                      |    4 ++++
 Src/DasherCore/DasherModel.cpp |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6cdaaab..c9a1145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-15  Alan Lawrence <acl33 inf phy cam ac uk>
+
+	* OneStepTowards clears goto queue - improves handling of CStylusFilter.
+
 2009-08-14  Patrick Welche <prlw1 cam ac uk>
 
 	* Trivial fix so Chinese will compile - ConversionNodes are still
diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index d5fc34e..01c6f00 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -476,7 +476,7 @@ bool CDasherModel::NextScheduledStep(unsigned long iTime, Dasher::VECTOR_SYMBOL_
 
 bool CDasherModel::OneStepTowards(myint miMousex, myint miMousey, unsigned long iTime, Dasher::VECTOR_SYMBOL_PROB* pAdded, int* pNumDeleted) {
   //if (GetBoolParameter(BP_DASHER_PAUSED)) return false;
-  DASHER_ASSERT(m_deGotoQueue.size() == 0);
+  m_deGotoQueue.clear();
 
   myint iNewMin, iNewMax;
   // works out next viewpoint



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]