Merge pull request #4533 from Be-ing/rename_maybe

rename maybeStartOrStopPolling to pollIfAnyControllersOpen
mixxxdj · Nov 22, 2021 · 3e2c90d · 3e2c90d
2 parents b3bf167 + d25897e
commit 3e2c90d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
@@ -294,10 +294,10 @@ void ControllerManager::slotSetUpDevices() {
         pController->applyMapping();
     }
 
-    maybeStartOrStopPolling();
+    pollIfAnyControllersOpen();
 }
 
-void ControllerManager::maybeStartOrStopPolling() {
+void ControllerManager::pollIfAnyControllersOpen() {
     auto locker = lockMutex(&m_mutex);
     QList<Controller*> controllers = m_controllers;
     locker.unlock();
@@ -378,7 +378,7 @@ void ControllerManager::openController(Controller* pController) {
         pController->close();
     }
     int result = pController->open();
-    maybeStartOrStopPolling();
+    pollIfAnyControllersOpen();
 
     // If successfully opened the device, apply the mapping and save the
     // preference setting.
@@ -396,7 +396,7 @@ void ControllerManager::closeController(Controller* pController) {
         return;
     }
     pController->close();
-    maybeStartOrStopPolling();
+    pollIfAnyControllersOpen();
     // Update configuration to reflect controller is disabled.
     m_pConfig->setValue(
             ConfigKey("[Controller]", sanitizeDeviceName(pController->getName())), 0);

diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h
@@ -70,7 +70,7 @@ class ControllerManager : public QObject {
     void pollDevices();
     void startPolling();
     void stopPolling();
-    void maybeStartOrStopPolling();
+    void pollIfAnyControllersOpen();
 
   private:
     UserSettingsPointer m_pConfig;