Add additional mysql connection debug code

[bacula/bacula] / bacula / src / qt-console / mainwin.cpp

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 73a67f233757bad511d0ed5a83d5b3b98b80f5fc..a1352c742960cb8944970e4cf55bfec931aa8a30 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -69,6 +69,7 @@ MainWin::MainWin(QWidget *parent) : QMainWindow(parent)
    app->setOverrideCursor(QCursor(Qt::WaitCursor));
    m_isClosing = false;
    m_waitState = false;
+   m_doConnect = false;
    m_dtformat = "yyyy-MM-dd HH:mm:ss";
    mainWin = this;
    setupUi(this);                     /* Setup UI defined by main.ui (designer) */
@@ -95,8 +96,7 @@ MainWin::MainWin(QWidget *parent) : QMainWindow(parent)
    foreach(Console *console, m_consoleHash)
       console->connect_dir();
    m_currentConsole = (Console*)getFromHash(m_firstItem);
-   m_currentConsole->setCurrent();
-   QTimer::singleShot(2000, this, SLOT(popLists()));
+   QTimer::singleShot(750, this, SLOT(popLists()));
    if (m_miscDebug) {
       QString directoryResourceName;
       m_currentConsole->getDirResName(directoryResourceName);
@@ -108,9 +108,11 @@ void MainWin::popLists()
 {
    foreach(Console *console, m_consoleHash)
       console->populateLists(true);
+   app->restoreOverrideCursor();
+   m_doConnect = true;
    connectConsoleSignals();
    connectSignals();
-   app->restoreOverrideCursor();
+   m_currentConsole->setCurrent();
 }
 
 void MainWin::createPages()
@@ -296,6 +298,11 @@ void MainWin::disconnectSignals()
  */
 void MainWin::waitEnter()
 {
+   if (m_waitState){ 
+      if (mainWin->m_connDebug)
+         Pmsg0(000, "Should Never Get Here DANGER DANGER, for now I'll return\n");
+      return;
+   }
    m_waitState = true;
    if (mainWin->m_connDebug)
       Pmsg0(000, "Entering Wait State\n");
@@ -316,8 +323,10 @@ void MainWin::waitExit()
    app->restoreOverrideCursor();
    if (m_waitTreeItem != treeWidget->currentItem())
       treeWidget->setCurrentItem(m_waitTreeItem);
-   connectSignals();
-   connectConsoleSignals();
+   if (m_doConnect) {
+      connectSignals();
+      connectConsoleSignals();
+   }
 }
 
 void MainWin::connectConsoleSignals()
@@ -562,8 +571,8 @@ void MainWin::input_line()
    QString cmdStr = lineEdit->text();    /* Get the text */
    lineEdit->clear();                    /* clear the lineEdit box */
    if (m_currentConsole->is_connected()) {
-      /* Use consoleInput to allow typing anything */
-      m_currentConsole->consoleInput(cmdStr);
+      /* Use consoleCommand to allow typing anything */
+      m_currentConsole->consoleCommand(cmdStr);
    } else {
       set_status(tr("Director not connected. Click on connect button."));
    }