Index: sources/view/settings/VBluetooth.cpp
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rc447018bc6c50996f402e01f951d40b17a120705
--- sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/view/settings/VBluetooth.cpp	(.../VBluetooth.cpp)	(revision c447018bc6c50996f402e01f951d40b17a120705)
@@ -129,11 +129,13 @@
         break;
 
     case MBluetooth::eIS_Scan_Start             :
+        scanEnabled(false); // disable the scan button while it 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 happening
         break;
 
     case MBluetooth::eIS_Device_Waiting         : // Selected device connected and is in waiting mode for read.
@@ -163,6 +165,7 @@
     case MBluetooth::eIS_Device_Error           :
     case MBluetooth::eIS_Device_Done            :
     case MBluetooth::eIS_Device_Disconnect      :
+    case MBluetooth::eIS_Device_Pairing         :
 
     case MBluetooth::eIS_Service_Start          :
     case MBluetooth::eIS_Service_Invalid        :
@@ -257,11 +260,12 @@
     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 Measurement ..."     ); 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;
     case MBluetooth::eIS_Device_Disconnect      : message = tr("Device In Power Saving Mode"            ); break; // received feedback and changed the "Disconnected" to this to avoid user confusion.
+    case MBluetooth::eIS_Device_Pairing         : message = tr("Device Is Pairing..."                   ); break;
 
     case MBluetooth::eIS_Service_Start          : message = tr("Service Scanning ..."                   ); break;
     case MBluetooth::eIS_Service_Error          : message = tr("Service Error: %1"                      ).arg(_error        ); break;