[PC-BSD Commits] r13551 - pcbsd/current/src-qt4/pc-softwaremanager

[svn at pcbsd.org]

Author: kenmoore
Date: 2011-10-28 10:54:10 -0700 (Fri, 28 Oct 2011)
New Revision: 13551

Modified:
   pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp
   pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.h
Log:
Fix a bug where closing the Appcafe by the 'x' and hitting 'no' at the confirmation would still close anyway



Modified: pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp	2011-10-28 14:37:01 UTC (rev 13550)
+++ pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp	2011-10-28 17:54:10 UTC (rev 13551)
@@ -680,6 +680,10 @@
 
 void PBM::closeEvent(QCloseEvent *event)
 {
-   slotQuitButtonClicked();
+  // Check if we are working right now
+  if ( checkOkToClose() )
+    close();
+  else
+    event->ignore();
+}
 
-}

Modified: pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.h
===================================================================
--- pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.h	2011-10-28 14:37:01 UTC (rev 13550)
+++ pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.h	2011-10-28 17:54:10 UTC (rev 13551)
@@ -52,7 +52,7 @@
 
 public slots:
     void slotSingleInstance();
-
+    
 protected:
     void closeEvent(QCloseEvent *event);
 
@@ -203,7 +203,7 @@
     QList<QStringList> transApps;
     
 signals:
-
+    
 } ;
 #endif // PBM_H