More porting from Branch-4.0

diff --git a/bacula/src/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp
index 2042cee03464f6baee00f1ba9d2a5516bc34488d..d2534d23080bf8e475cc8e1926550c1c65b2ae29 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm.cpp
@@ -292,6 +292,7 @@ int DirComm::read()
          } 
          app->processEvents();
          if (m_api_set && m_console->is_messagesPending() && is_notify_enabled() && m_console->hasFocus()) {
+            if (mainWin->m_commDebug) Pmsg1(000, "conn %i process_events\n", m_conn);
             m_console->write_dir(m_conn, ".messages", false);
             m_console->messagesPending(false);
          }
@@ -316,6 +317,7 @@ int DirComm::read()
             m_console->write_dir(m_conn, ".messages", false);
             m_console->displayToPrompt(m_conn);
             m_console->messagesPending(false);
+            continue;
          }
          m_console->messagesPending(true);
          continue;

diff --git a/bacula/src/qt-console/restore/restore.cpp b/bacula/src/qt-console/restore/restore.cpp
index bd67b09815f14fa10c4c6e83db6ab127b725c581..107e791d8a55bd319523ba13c6f8a69971848d4d 100644 (file)
--- a/bacula/src/qt-console/restore/restore.cpp
+++ b/bacula/src/qt-console/restore/restore.cpp
@@ -204,7 +204,7 @@ void restorePage::addDirectory(QString &newdirr)
    }
 
    if (isWin32Path(fullpath)) {
-      Pmsg0(dbglvl, "Windows drive\n");
+      if (mainWin->m_miscDebug) Pmsg0(dbglvl, "Windows drive\n");
       if (fullpath.left(1) == "/") {
          fullpath.replace(0, 1, "");           /* strip leading / */
       }
@@ -243,7 +243,7 @@ void restorePage::addDirectory(QString &newdirr)
          /* this is the base widget */
          item = new QTreeWidgetItem(directoryWidget);
          item->setText(0, fullpath.toUtf8().data());
-         Pmsg1(dbglvl, "Windows: %s\n", fullpath.toUtf8().data());
+         if (mainWin->m_miscDebug) Pmsg1(dbglvl, "Windows: %s\n", fullpath.toUtf8().data());
          item->setIcon(0,QIcon(QString::fromUtf8(":images/folder.png")));
       } else {
          QTreeWidgetItem *parent = m_dirPaths.value(m_cwd);
@@ -354,7 +354,7 @@ void restorePage::fileDoubleClicked(QTreeWidgetItem *item, int column)
          QString msg = QString("DoubleClick else of item column %1 fullpath %2\n")
               .arg(column,10)
               .arg(fullpath);
-         Pmsg1(dbglvl, "%s\n", msg.toUtf8().data());
+         if (mainWin->m_miscDebug) Pmsg1(dbglvl, "%s\n", msg.toUtf8().data());
       }
    }
 }