Index: sources/view/settings/VBluetooth.cpp
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rb4c2f678d92cea5e5a4d7c6de0afc9181bd8e255
--- sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision b4c2f678d92cea5e5a4d7c6de0afc9181bd8e255)
@@ -129,16 +129,19 @@
         break;
 
     case MBluetooth::eIS_Scan_Start             :
+        scanEnabled(false); // disable the scan button while the device is scanning
         reset();
         break;
 
     case MBluetooth::eIS_Scan_Done              :
         if (! _devices.count()) state = MBluetooth::eIS_Scan_NotFound;
+        scanEnabled(true); // enable the scan button when scanning is not running
         break;
 
     case MBluetooth::eIS_Device_Waiting         : // Selected device connected and is in waiting mode for read.
         pairedAddr(vData.deviceAddr);
         pairedBatt(vData.deviceBatt);
+        scanEnabled(true);
         break;
 
     case MBluetooth::eIS_Idle                   :
@@ -257,7 +260,7 @@
     case MBluetooth::eIS_Device_Init            : message = tr("Device Initializing ..."                ); break;
     case MBluetooth::eIS_Device_Error_Init      : message = tr("Device Initialization Error"            ); break;
     case MBluetooth::eIS_Device_Start           : message = tr("Device Connecting ..."                  ); break;
-    case MBluetooth::eIS_Device_Waiting         : message = tr("Device Waiting To Connect ..."          ); break; // received feedback and changed the "Waiting" to this to avoid user confusion.
+    case MBluetooth::eIS_Device_Waiting         : message = tr("Device Waiting For Measurememnt ..."    ); break; // received feedback and changed the "Waiting" to this to avoid user confusion.
     case MBluetooth::eIS_Device_Error           : message = tr("Device Connection Error"                ); break;
     case MBluetooth::eIS_Device_Connect         : message = tr("Device Connected"                       ); break;
     case MBluetooth::eIS_Device_Done            : message = tr("Device Clean Up"                        ); break;