[Digikam-devel] extragear/graphics/digikam/utilities/cameragui

[Gilles Caulier]

SVN commit 525920 by cgilles:

digikam from trunk : bugfix : KDilogBase to not emit a closeEvent when 'CLose' button is used. Need to move old closeEvent() actions to a new common method called by closeEvent() and slotClose().

CCMAIL: digikam-devel at kde.org


 M  +12 -1     cameraui.cpp  
 M  +2 -0      cameraui.h  


--- trunk/extragear/graphics/digikam/utilities/cameragui/cameraui.cpp #525919:525920
@@ -392,6 +392,18 @@
 
 void CameraUI::closeEvent(QCloseEvent* e)
 {
+    dialogClosed();
+    e->accept();
+}
+
+void CameraUI::slotClose()
+{
+    dialogClosed();
+    reject();
+}
+
+void CameraUI::dialogClosed()
+{
     // When a directory is created, a watch is put on it to spot new files
     // but it can occur that the file is copied there before the watch is
     // completely setup. That is why as an extra safeguard run scanlib
@@ -411,7 +423,6 @@
 
     delete d->controller;
     saveSettings();
-    e->accept();
 }
 
 void CameraUI::slotBusy(bool val)
--- trunk/extragear/graphics/digikam/utilities/cameragui/cameraui.h #525919:525920
@@ -68,6 +68,7 @@
 
     void readSettings();
     void saveSettings();
+    void dialogClosed();
     bool createAutoAlbum(const KURL& parentURL,
                          const QString& name,
                          const QDate& date,
@@ -76,6 +77,7 @@
 
 private slots:
 
+    void slotClose();
     void slotProcessURL(const QString& url);
 
     void slotConnected(bool val);