Pull compiler warning cleanup code + other from master

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

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index 09d1dff3ed92bc7c65c8a7da46f14d7fb3398013..05cbda83671295c2ca8eb34d899ef43cfcd70522 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -74,8 +74,11 @@ MediaList::~MediaList()
  */
 void MediaList::populateTree()
 {
-   if (m_populated)
+   QTreeWidgetItem *pooltreeitem = NULL;
+
+   if (m_populated) {
       writeExpandedSettings();
+   }
    m_populated = true;
 
    Freeze frz(*mp_treeWidget); /* disable updating*/
@@ -102,7 +105,6 @@ void MediaList::populateTree()
    settings.beginGroup("MediaListTreeExpanded");
    QString query;
 
-   QTreeWidgetItem *pooltreeitem;
 
    /* Comma separated list of pools first */
    bool first = true;