Index: /trunk/BNC/bncwindow.cpp
===================================================================
--- /trunk/BNC/bncwindow.cpp	(revision 1198)
+++ /trunk/BNC/bncwindow.cpp	(revision 1199)
@@ -614,5 +614,5 @@
   _mountPointsTable->hideColumn(0);
   _mountPointsTable->sortItems(1);
-  if (mountPoints->count() > 0) {
+  if (mountPoints->count() > 0 && !_actStop->isEnabled()) {
     _actGetData->setEnabled(true);
   }
@@ -674,6 +674,7 @@
 void bncWindow::slotGetThreadErrors() {
   ((bncApp*)qApp)->slotMessage("All Get Threads Terminated");
-  _actAddMountPoints->setEnabled(true);
-  _actGetData->setEnabled(true);
+  if (!_actStop->isEnabled()) {
+    _actGetData->setEnabled(true);
+  }
 }
 
@@ -683,5 +684,4 @@
   slotSaveOptions();
 
-  _actAddMountPoints->setEnabled(true); // changed from 'false' to 'true' to keep 'Add Mountpoints' button active
   _actDeleteMountPoints->setEnabled(false);
   _actGetData->setEnabled(false);
@@ -715,5 +715,4 @@
     _actGetData->setEnabled(true);
     _actStop->setEnabled(false);
-    _actAddMountPoints->setEnabled(true);
   }
 }