From: Dirk H Bartley <dbartley@schupan.com>
Date: Sun, 15 Mar 2009 01:12:07 +0000 (+0000)
Subject: The records filled with '*None*' are still there.  This is a temporary fix.
X-Git-Tag: Release-3.0.0~159
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=32cb8ccf5fb8eb828ad2d623020cdb53d2d0b81e;p=bacula%2Fbacula

The records filled with '*None*' are still there.  This is a temporary fix.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8533 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index b39299391c..7e4cd70652 100644
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -323,12 +323,20 @@ bool Console::sql_cmd(const char *query, QStringList &results)
    pm_strcat(cmd, "\"");
    write(cmd.c_str());
    while ((stat = read()) > 0) {
+      bool first = true;
       if (mainWin->m_displayAll) {
          display_text(msg());
          display_text("\n");
       }
       strip_trailing_junk(msg());
-      results << msg();
+      bool doappend = true;
+      if (first) {
+         QString dum = msg();
+         if ((dum.left(6) == "*None*")) doappend = false;
+      }
+      if (doappend)
+         results << msg();
+      first = false;
    }
    notify(true);
    discardToPrompt();