The fix that I did last night seems to be occuring in just about all of the

major classes.  So I put the fix into the rest of the them and added an
initialization of the variable to false in the constructor.

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

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index 09a9def72b60befac52ee7a4a5967b958b116bf5..ce4b25dd5604a3f606a2a3f1e2c04db4df521f94 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -53,6 +53,7 @@ Clients::Clients()
 
    /* tableWidget, Storage Tree Tree Widget inherited from ui_client.h */
    m_populated = false;
+   m_populating = false;
    m_checkcurwidget = true;
    m_closeable = false;
    /* add context sensitive menu items specific to this classto the page
@@ -72,11 +73,15 @@ Clients::~Clients()
  */
 void Clients::populateTable()
 {
-   QBrush blackBrush(Qt::black);
+   if (m_populating)
+      return;
+   m_populating = true;
 
    if (!m_console->preventInUseConnect())
       return;
 
+   QBrush blackBrush(Qt::black);
+
    QStringList headerlist = (QStringList() << tr("Client Name") << tr("File Retention")
        << tr("Job Retention") << tr("AutoPrune") << tr("ClientId") << tr("Uname") );
 
@@ -157,6 +162,7 @@ void Clients::populateTable()
    /* Resize rows and columns */
    tableWidget->resizeColumnsToContents();
    tableWidget->resizeRowsToContents();
+   m_populating = false;
 }
 
 /*

diff --git a/bacula/src/qt-console/clients/clients.h b/bacula/src/qt-console/clients/clients.h
index 8c206faa49f6d4fe5f98f40b8f148f89d1a3cb6e..f90866a1385e91ad87b0cd2f7d6b1b5a011337d1 100644 (file)
--- a/bacula/src/qt-console/clients/clients.h
+++ b/bacula/src/qt-console/clients/clients.h
@@ -63,6 +63,7 @@ private:
    void createContextMenu();
    QString m_currentlyselected;
    bool m_populated;
+   bool m_populating;
    bool m_checkcurwidget;
 };
 

diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index 915afa933e888c6335b5716b3614e18384b02d5f..466639bbd13b1e887e5e91a7adf410bafa4a4da7 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.cpp
@@ -51,6 +51,7 @@ FileSet::FileSet()
 
    /* tableWidget, FileSet Tree Tree Widget inherited from ui_fileset.h */
    m_populated = false;
+   m_populating = false;
    m_checkcurwidget = true;
    m_closeable = false;
    readSettings();
@@ -71,11 +72,15 @@ FileSet::~FileSet()
  */
 void FileSet::populateTable()
 {
-   QBrush blackBrush(Qt::black);
+   if (m_populating)
+      return;
+   m_populating = true;
 
    if (!m_console->preventInUseConnect())
        return;
 
+   QBrush blackBrush(Qt::black);
+
    m_checkcurwidget = false;
    tableWidget->clear();
    m_checkcurwidget = true;
@@ -140,6 +145,7 @@ void FileSet::populateTable()
    /* Resize rows and columns */
    tableWidget->resizeColumnsToContents();
    tableWidget->resizeRowsToContents();
+   m_populating = false;
 }
 
 /*

diff --git a/bacula/src/qt-console/fileset/fileset.h b/bacula/src/qt-console/fileset/fileset.h
index 8973c3405ee7c677498be6569771bd5b86607a40..dc22372621cac3a1c4da3da8cf3c20cf0b3f9ac0 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.h
+++ b/bacula/src/qt-console/fileset/fileset.h
@@ -62,6 +62,7 @@ private:
    void createContextMenu();
    QString m_currentlyselected;
    bool m_populated;
+   bool m_populating;
    bool m_checkcurwidget;
 };
 

diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp
index 1e08be172d0caee34fc0adbdb23935d88acf4a71..6bc2610414bbfe5009ea440c2d26b00302849e3e 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.cpp
+++ b/bacula/src/qt-console/joblist/joblist.cpp
@@ -62,6 +62,7 @@ JobList::JobList(const QString &mediaName, const QString &clientName,
 
    m_resultCount = 0;
    m_populated = false;
+   m_populating = false;
    m_closeable = false;
    if ((m_mediaName != "") || (m_clientName != "") || (m_jobName != "") || (m_filesetName != ""))
       m_closeable=true;
@@ -108,6 +109,9 @@ JobList::~JobList()
  */
 void JobList::populateTable()
 {
+   if (m_populating)
+      return;
+   m_populating = true;
    if (!m_console->preventInUseConnect())
        return;
 
@@ -218,6 +222,7 @@ void JobList::populateTable()
           tr("The Jobs query returned no results.\n"
          "Press OK to continue?"), QMessageBox::Ok );
    }
+   m_populating = false;
 }
 
 void JobList::prepareFilterWidgets()

diff --git a/bacula/src/qt-console/joblist/joblist.h b/bacula/src/qt-console/joblist/joblist.h
index 7138e3b50700e555a386b1602d2367e7c1065768..12cbd60e4eb83a9bf3fb9abe7e4564e158a23f1e 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.h
+++ b/bacula/src/qt-console/joblist/joblist.h
@@ -85,6 +85,7 @@ private:
    QString m_filesetName;
    QString m_currentJob;
    bool m_populated;
+   bool m_populating;
    bool m_checkCurrentWidget;
    int m_jobIdIndex;
    int m_purgedIndex;

diff --git a/bacula/src/qt-console/jobs/jobs.cpp b/bacula/src/qt-console/jobs/jobs.cpp
index 4bb07ae3a8476de1b24fa58751d8db6fcd02ad50..a6054c79dfb6ecc276d8978937175cd1d6124f53 100644 (file)
--- a/bacula/src/qt-console/jobs/jobs.cpp
+++ b/bacula/src/qt-console/jobs/jobs.cpp
@@ -50,6 +50,7 @@ Jobs::Jobs()
 
    /* tableWidget, Storage Tree Tree Widget inherited from ui_client.h */
    m_populated = false;
+   m_populating = false;
    m_checkcurwidget = true;
    m_closeable = false;
    /* add context sensitive menu items specific to this classto the page
@@ -69,10 +70,12 @@ Jobs::~Jobs()
  */
 void Jobs::populateTable()
 {
-   QBrush blackBrush(Qt::black);
-
+   if (m_populating)
+      return;
+   m_populating = true;
    if (!m_console->preventInUseConnect())
       return;
+   QBrush blackBrush(Qt::black);
    m_checkcurwidget = false;
    tableWidget->clear();
    m_checkcurwidget = true;
@@ -122,6 +125,7 @@ void Jobs::populateTable()
    /* Resize rows and columns */
    tableWidget->resizeColumnsToContents();
    tableWidget->resizeRowsToContents();
+   m_populating = true;
 }
 
 /*

diff --git a/bacula/src/qt-console/jobs/jobs.h b/bacula/src/qt-console/jobs/jobs.h
index de255bdda66cd4a56bc075c52c2b51220d5248aa..b2ba435567429d76185e063823392cc92641ae93 100644 (file)
--- a/bacula/src/qt-console/jobs/jobs.h
+++ b/bacula/src/qt-console/jobs/jobs.h
@@ -66,6 +66,7 @@ private:
    void createContextMenu();
    QString m_currentlyselected;
    bool m_populated;
+   bool m_populating;
    bool m_checkcurwidget;
    int m_typeIndex;
 };

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index 7ce47962ea6af073a21afb781d7ba9548a8fa8e6..b32670a37919a0d72a333af718ee99b8a7153c65 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -56,6 +56,7 @@ MediaList::MediaList()
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_medialist.h */
    m_populated = false;
+   m_populating = false;
    m_checkcurwidget = true;
    m_closeable = false;
    /* add context sensitive menu items specific to this classto the page

diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index 36e077525067b32bb542fae63a6f36e50dfc2a93..f1391d91769012846326e4da28323c37e6ff3cca 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -53,6 +53,7 @@ Storage::Storage()
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_storage.h */
    m_populated = false;
+   m_populating = false;
    m_checkcurwidget = true;
    m_closeable = false;
    m_currentStorage = "";
@@ -74,6 +75,9 @@ Storage::~Storage()
  */
 void Storage::populateTree()
 {
+   if (m_populating)
+      return;
+   m_populating = true;
    if (!m_console->preventInUseConnect())
        return;
 
@@ -146,6 +150,7 @@ void Storage::populateTree()
    for(int cnter=0; cnter<headerlist.size(); cnter++) {
       mp_treeWidget->resizeColumnToContents(cnter);
    }
+   m_populating = false;
 }
 void Storage::mediaList(QTreeWidgetItem *parent, const QString &storageID)
 {

diff --git a/bacula/src/qt-console/storage/storage.h b/bacula/src/qt-console/storage/storage.h
index 3e778f12bb76e4cb4257e51afed424f9beb8495d..9a49d04d804f5d93648ca0bf3a6403947becb31b 100644 (file)
--- a/bacula/src/qt-console/storage/storage.h
+++ b/bacula/src/qt-console/storage/storage.h
@@ -68,6 +68,7 @@ private:
    QString m_currentStorage;
    bool m_currentAutoChanger;
    bool m_populated;
+   bool m_populating;
    bool m_checkcurwidget;
    void writeExpandedSettings();
    QTreeWidgetItem *m_topItem;