[ROSAUTOTEST]

- Do not duplicate console output in StringOut if forcePrint = false
ROSTESTS-144

svn path=/trunk/; revision=64670
This commit is contained in:
Thomas Faber 2014-10-11 14:34:56 +00:00
parent 201b9736c0
commit 8f8255e36b

View file

@ -143,14 +143,14 @@ StringOut(const string& String, bool forcePrint)
}
}
/* Output the string */
cout << NewString;
size = curr_pos - start;
/* Only print if forced to or if the rest is a whole line */
if(forcePrint == true || NewString[curr_pos - 1] == '\n')
{
/* Output the whole string */
cout << NewString;
memcpy(DbgString, NewString.c_str() + start, size);
DbgString[size] = 0;
DbgPrint(DbgString);
@ -159,6 +159,9 @@ StringOut(const string& String, bool forcePrint)
return NewString;
}
/* Output full lines only */
cout << NewString.substr(0, start);
/* Return the remaining chunk */
return NewString.substr(start, size);
}