Merge branch 'master' of github.com:obiwankennedy/DiceParser

Conflicts:
	parsingtoolbox.cpp

1 files changed, 9 insertions, 1 deletions

diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index 63b5739..3e09bac 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -63,6 +63,14 @@ bool ParsingToolBox::readLogicOperator(QString& str,BooleanCondition::LogicOpera
 
     return false;
 }
+ParsingToolBox::~ParsingToolBox()
+{
+	if(NULL!=m_logicOp)
+	{
+		delete m_logicOp;
+		m_logicOp = NULL;
+	}
+}
 Validator* ParsingToolBox::readValidator(QString& str)
 {
     Validator* returnVal=NULL;
@@ -181,7 +189,7 @@ bool ParsingToolBox::readList(QString& str,QStringList& list)
         {
             QString liststr = str.left(pos);
             list = liststr.split(",");
-            str=str.remove(0,liststr.size()+1);
+			str=str.remove(0,pos+1);
             return true;
         }
     }