From 2cf2e693b93415a492a247a0a4fd7b66383dbb56 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Tue, 4 Feb 2014 12:27:57 -0800
Subject: [PATCH] fix debug to properly work with outputBufferBits()

---
 interface/src/Application.cpp       | 10 ++++++----
 libraries/shared/src/SharedUtil.cpp |  9 ++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index ca87c812d3..d0d071a141 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -101,10 +101,12 @@ const QString SKIP_FILENAME = QStandardPaths::writableLocation(QStandardPaths::D
 
 const int STATS_PELS_PER_LINE = 20;
 
-void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message) {
-    QString messageWithNewLine = message + "\n";
-    fprintf(stdout, "%s", messageWithNewLine.toLocal8Bit().constData());
-    Application::getInstance()->getLogger()->addMessage(messageWithNewLine.toLocal8Bit().constData());
+void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
+    if (message.size() > 0) {
+        QString messageWithNewLine = message + "\n";
+        fprintf(stdout, "%s", messageWithNewLine.toLocal8Bit().constData());
+        Application::getInstance()->getLogger()->addMessage(messageWithNewLine.toLocal8Bit().constData());
+    }
 }
 
 Application::Application(int& argc, char** argv, timeval &startup_time) :
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 3b869e0ece..f22c81a71a 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -65,6 +65,8 @@ bool shouldDo(float desiredInterval, float deltaTime) {
     return randFloat() < deltaTime / desiredInterval;
 }
 
+
+
 void outputBufferBits(const unsigned char* buffer, int length, QDebug* continuedDebug) {
     for (int i = 0; i < length; i++) {
         outputBits(buffer[i], continuedDebug);
@@ -76,6 +78,7 @@ void outputBits(unsigned char byte, QDebug* continuedDebug) {
 
     if (continuedDebug) {
         debug = *continuedDebug;
+        debug.nospace();
     }
 
     QString resultString;
@@ -85,12 +88,12 @@ void outputBits(unsigned char byte, QDebug* continuedDebug) {
     } else {
         resultString.sprintf("[ %d (0x%x): ", byte, byte);
     }
-    debug << resultString;
-
+    debug << qPrintable(resultString);
+    
     for (int i = 0; i < 8; i++) {
         resultString.sprintf("%d", byte >> (7 - i) & 1);
+        debug << qPrintable(resultString);
     }
-    debug << resultString;
     debug << " ]";
 }