[Scummvm-cvs-logs] SF.net SVN: scummvm:[48717] scummvm/branches/branch-1-1-0/common/debug.cpp

[lordhoto at users.sourceforge.net]

Revision: 48717
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48717&view=rev
Author:   lordhoto
Date:     2010-04-19 12:54:07 +0000 (Mon, 19 Apr 2010)

Log Message:
-----------
Backport of r48716: "Fix regression introduced with r46130, which caused debugN strings to be post processed via debugOutputFormatter."

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/common/debug.cpp

Modified: scummvm/branches/branch-1-1-0/common/debug.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/common/debug.cpp	2010-04-19 12:50:49 UTC (rev 48716)
+++ scummvm/branches/branch-1-1-0/common/debug.cpp	2010-04-19 12:54:07 UTC (rev 48717)
@@ -156,7 +156,7 @@
 
 	// Next, give the active engine (if any) a chance to augment the message,
 	// but only if not used from debugN.
-	if (Common::s_debugOutputFormatter) {
+	if (caret && Common::s_debugOutputFormatter) {
 		(*Common::s_debugOutputFormatter)(buf, in_buf, STRINGBUFLEN);
 	} else {
 		strncpy(buf, in_buf, STRINGBUFLEN);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.