[PC-BSD Commits] r17756 - pcbsd/current/src-qt4/libpcbsd

[svn at pcbsd.org]

Author: kris
Date: 2012-07-16 14:15:03 +0000 (Mon, 16 Jul 2012)
New Revision: 17756

Modified:
   pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp
   pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h
   pcbsd/current/src-qt4/libpcbsd/utils.cpp
Log:

Fix a bug with closing the progress dialog when changing meta-packages



Modified: pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp	2012-07-16 14:04:09 UTC (rev 17755)
+++ pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp	2012-07-16 14:15:03 UTC (rev 17756)
@@ -351,8 +351,10 @@
 
 void metaWidget::slotMetaDelDone()
 {
-	if ( ! delPkgs.isEmpty() )
-		metaProgressDel->close();
+	if ( ! delPkgs.isEmpty() ) {
+		metaProgressDel->hide();
+		delete metaProgressDel;
+	}
 
         // If the user canceled the process, we can stop here
         if ( canceled )
@@ -423,7 +425,9 @@
 void metaWidget::slotMetaAddDone()
 {
 	//if ( ! addPkgs.isEmpty() )
-		metaProgressAdd->close();
+	metaProgressAdd->hide();
+	delete metaProgressAdd;
+
  
 	populateMetaPkgs();
 

Modified: pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h	2012-07-16 14:04:09 UTC (rev 17755)
+++ pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h	2012-07-16 14:15:03 UTC (rev 17756)
@@ -92,6 +92,7 @@
   int  getSubVal();
   void show();
   void close();
+  void hide();
 
 private slots:
   void slotCancel();

Modified: pcbsd/current/src-qt4/libpcbsd/utils.cpp
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/utils.cpp	2012-07-16 14:04:09 UTC (rev 17755)
+++ pcbsd/current/src-qt4/libpcbsd/utils.cpp	2012-07-16 14:15:03 UTC (rev 17756)
@@ -903,6 +903,10 @@
   d_p->close();
 }
 
+void metaProgressDialog::hide() {
+  d_p->hide();
+}
+
 void metaProgressDialog::slotCancel() {
   emit canceled();
 }