[tfaber] 64670: [ROSAUTOTEST] - Do not duplicate console output in StringOut if forcePrint = false ROSTESTS-144

Author: tfaber
Date: Sat Oct 11 14:34:56 2014
New Revision: 64670

URL: http://svn.reactos.org/svn/reactos?rev=64670&view=rev
Log:
[ROSAUTOTEST]
- Do not duplicate console output in StringOut if forcePrint = false
ROSTESTS-144

Modified:
    trunk/rostests/rosautotest/tools.cpp

Modified: trunk/rostests/rosautotest/tools.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev=...
==============================================================================
--- trunk/rostests/rosautotest/tools.cpp	[iso-8859-1] (original)
+++ trunk/rostests/rosautotest/tools.cpp	[iso-8859-1] Sat Oct 11 14:34:56 2014
@@ -143,14 +143,14 @@
         }
     }

-    /* 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);
@@ -158,6 +158,9 @@
         NewString.clear();
         return NewString;
     }
+
+    /* Output full lines only */
+    cout << NewString.substr(0, start);

/* Return the remaining chunk */
     return NewString.substr(start, size);