[Bacula-commits] git: Bacula branch, Branch-5.0, updated. c7fdd06bfe8f332d0832ba78fe333c38ccd34795

[Kern S. <ke...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula".

The branch, Branch-5.0 has been updated
       via  c7fdd06bfe8f332d0832ba78fe333c38ccd34795 (commit)
      from  9bb55770097e7c438f8bcf92ee5c6bb4259cf812 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c7fdd06bfe8f332d0832ba78fe333c38ccd34795
Author: Kern Sibbald <ke...@si...>
Date:   Fri Nov 12 09:02:06 2010 +0100

    Prevent timer recursion in bat

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/src/qt-console/status/clientstat.cpp b/bacula/src/qt-console/status/clientstat.cpp
index 37b9831..b36b22b 100644
--- a/bacula/src/qt-console/status/clientstat.cpp
+++ b/bacula/src/qt-console/status/clientstat.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -26,7 +26,6 @@
    Switzerland, email:ft...@fs....
 */
 /*
- *   Version $Id: clientstat.cpp 5880 2007-11-09 01:20:40Z bartleyd2 $
  *
  *   Dirk Bartley, March 2007
  */
@@ -36,6 +35,9 @@
 #include <QTableWidgetItem>
 #include "clientstat.h"
 
+/* This probably should be on a mutex */
+static bool working = false;   /* prevent timer recursion */
+
 /*
  * Constructor for the class
  */
@@ -96,12 +98,14 @@ void ClientStat::timerTriggered()
 {
    double value = timerDisplay->value();
    value -= 1;
-   if (value == 0) {
+   if (value <= 0 && !working) {
+      working = true;
       value = spinBox->value();
       bool iscurrent = mainWin->tabWidget->currentIndex() == mainWin->tabWidget->indexOf(this);
       if (((isDocked() && iscurrent) || (!isDocked())) && (checkBox->checkState() == Qt::Checked)) {
          populateAll();
       }
+      working = false;
    }
    timerDisplay->display(value);
 }
@@ -211,7 +215,7 @@ void ClientStat::populateRunning()
 }
 
 /*
- * When the treeWidgetItem in the page selector tree is singleclicked, Make sure
+ * When the treeWidgetItem in the page selector tree is single clicked, Make sure
  * The tree has been populated.
  */
 void ClientStat::PgSeltreeWidgetClicked()
diff --git a/bacula/src/qt-console/status/dirstat.cpp b/bacula/src/qt-console/status/dirstat.cpp
index 8a9bd60..47c77fc 100644
--- a/bacula/src/qt-console/status/dirstat.cpp
+++ b/bacula/src/qt-console/status/dirstat.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -26,7 +26,6 @@
    Switzerland, email:ft...@fs....
 */
 /*
- *   Version $Id: dirstat.cpp 5880 2007-11-09 01:20:40Z bartleyd2 $
  *
  *   Dirk Bartley, March 2007
  */
@@ -36,6 +35,8 @@
 #include <QTableWidgetItem>
 #include "dirstat.h"
 
+static bool working = false;         /* prevent timer recursion */
+
 /*
  * Constructor for the class
  */
@@ -97,12 +98,14 @@ void DirStat::timerTriggered()
 {
    double value = timerDisplay->value();
    value -= 1;
-   if (value == 0) {
+   if (value <= 0 && !working) {
+      working = true;
       value = spinBox->value();
       bool iscurrent = mainWin->tabWidget->currentIndex() == mainWin->tabWidget->indexOf(this);
       if (((isDocked() && iscurrent) || ((!isDocked()) && isOnceDocked())) && (checkBox->checkState() == Qt::Checked)) {
          populateAll();
       }
+      working = false;
    }
    timerDisplay->display(value);
 }
@@ -171,7 +174,7 @@ void DirStat::populateTerminated()
                   p_tableitem->setBackground(Qt::green);
                else
                   p_tableitem->setBackground(Qt::red);
-	    }
+            }
             terminatedTable->setItem(results.size() - row - 1, column, p_tableitem);
             column += 1;
          }
diff --git a/bacula/src/qt-console/status/storstat.cpp b/bacula/src/qt-console/status/storstat.cpp
index b1673ad..f5235b3 100644
--- a/bacula/src/qt-console/status/storstat.cpp
+++ b/bacula/src/qt-console/status/storstat.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -26,7 +26,6 @@
    Switzerland, email:ft...@fs....
 */
 /*
- *   Version $Id: storstat.cpp 5880 2007-11-09 01:20:40Z bartleyd2 $
  *
  *   Dirk Bartley, March 2007
  */
@@ -38,6 +37,8 @@
 #include "mount/mount.h"
 #include "label/label.h"
 
+static bool working = false;     /* prevent timer recursion */
+
 /*
 .status storage=<storage-name> <keyword>
 where <storage-name> is the storage name in the Director, and 
@@ -113,12 +114,14 @@ void StorStat::timerTriggered()
 {
    double value = timerDisplay->value();
    value -= 1;
-   if (value == 0) {
+   if (value <= 0 && !working) {
+      working = true;
       value = spinBox->value();
       bool iscurrent = mainWin->tabWidget->currentIndex() == mainWin->tabWidget->indexOf(this);
       if (((isDocked() && iscurrent) || (!isDocked())) && (checkBox->checkState() == Qt::Checked)) {
          populateAll();
       }
+      working = false;
    }
    timerDisplay->display(value);
 }
@@ -267,7 +270,7 @@ void StorStat::populateTerminated()
                   p_tableitem->setBackground(Qt::green);
                else
                   p_tableitem->setBackground(Qt::red);
-	    }
+            }
             terminatedTable->setItem(row, column, p_tableitem);
             column += 1;
          }


hooks/post-receive
-- 
Bacula