Index: sources/gui/GuiView.cpp
===================================================================
diff -u -r7ebc073150532073ae7f1a0e768272bcff5d6fb3 -rfa8a24789926622048cdd480ea48abd9596c03b3
--- sources/gui/GuiView.cpp	(.../GuiView.cpp)	(revision 7ebc073150532073ae7f1a0e768272bcff5d6fb3)
+++ sources/gui/GuiView.cpp	(.../GuiView.cpp)	(revision fa8a24789926622048cdd480ea48abd9596c03b3)
@@ -213,8 +213,8 @@
  */
 void GuiView::onExport()
 {
-    emit didExport();
     exportRunning(false);
+    emit didExport();
 }
 
 
Index: sources/gui/qml/components/ExportButton.qml
===================================================================
diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -rfa8a24789926622048cdd480ea48abd9596c03b3
--- sources/gui/qml/components/ExportButton.qml	(.../ExportButton.qml)	(revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac)
+++ sources/gui/qml/components/ExportButton.qml	(.../ExportButton.qml)	(revision fa8a24789926622048cdd480ea48abd9596c03b3)
@@ -40,6 +40,8 @@
         onDidUSBDriveRemove : _root.enabled = false
         onDidUSBDriveMount  : _root.enabled = true  && ! disabled
         onDidExportLog      : _root.enabled = false
+        onDidExportService  : _root.enabled = false
+        onDidExportTreatment: _root.enabled = false
         onDidExport         : _root.enabled = true  && ! disabled
     }
 }
Index: sources/gui/qml/components/USBButton.qml
===================================================================
diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -rfa8a24789926622048cdd480ea48abd9596c03b3
--- sources/gui/qml/components/USBButton.qml	(.../USBButton.qml)	(revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac)
+++ sources/gui/qml/components/USBButton.qml	(.../USBButton.qml)	(revision fa8a24789926622048cdd480ea48abd9596c03b3)
@@ -42,6 +42,8 @@
         onDidUSBDriveRemove : _root.enabled = false
         onDidUSBDriveMount  : _root.enabled = true
         onDidExportLog      : _root.enabled = false
+        onDidExportService  : _root.enabled = false
+        onDidExportTreatment: _root.enabled = false
         onDidExport         : _root.enabled = true
     }
 }
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r7ebc073150532073ae7f1a0e768272bcff5d6fb3 -rfa8a24789926622048cdd480ea48abd9596c03b3
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 7ebc073150532073ae7f1a0e768272bcff5d6fb3)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision fa8a24789926622048cdd480ea48abd9596c03b3)
@@ -7,7 +7,7 @@
  *                                                                                 
  * \file    MAlarmMapping.cpp                                                     
  * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      05-Aug-2022                                                        
+ * \date    (last)      07-Aug-2022                                                        
  * \author  (original)  Behrouz NematiPour                                        
  * \date    (original)  03-May-2021                                               
  *