From e8cda901d1edcc5599c43720fd4fc6689b40bad5 Mon Sep 17 00:00:00 2001 From: Vasily Date: Thu, 27 Dec 2018 18:42:29 +0100 Subject: [PATCH] Rename local var that shadows member var Notice that the class has an identical var that is used in several places. It is unknown if the original programmer intended to use the member var in this function, but what is actually being done is a new var being created, changed and returned. This may not respect the original intention, but it does preserve the original mechanics. --- .../audiomanager/AudioManagerWindows.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp b/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp index 89a1c06..b05fcf5 100644 --- a/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp +++ b/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp @@ -277,20 +277,20 @@ IMMDeviceEnumerator* AudioManagerWindows::getAudioDeviceEnumerator() { } IPolicyConfig * AudioManagerWindows::getPolicyConfig() { - IPolicyConfig* policyConfig = nullptr; + IPolicyConfig* var_policyConfig = nullptr; // for Win 10 - auto hr = CoCreateInstance(__uuidof(CPolicyConfigClient), NULL, CLSCTX_INPROC, IID_IPolicyConfig2, (LPVOID *)&policyConfig); + auto hr = CoCreateInstance(__uuidof(CPolicyConfigClient), NULL, CLSCTX_INPROC, IID_IPolicyConfig2, (LPVOID *)&var_policyConfig); if (hr != S_OK) { - hr = CoCreateInstance(__uuidof(CPolicyConfigClient), NULL, CLSCTX_INPROC, IID_IPolicyConfig1, (LPVOID *)&policyConfig); + hr = CoCreateInstance(__uuidof(CPolicyConfigClient), NULL, CLSCTX_INPROC, IID_IPolicyConfig1, (LPVOID *)&var_policyConfig); } // for Win Vista, 7, 8, 8.1 if (hr != S_OK) { - hr = CoCreateInstance(__uuidof(CPolicyConfigClient), NULL, CLSCTX_INPROC, IID_IPolicyConfig0, (LPVOID *)&policyConfig); + hr = CoCreateInstance(__uuidof(CPolicyConfigClient), NULL, CLSCTX_INPROC, IID_IPolicyConfig0, (LPVOID *)&var_policyConfig); } if (hr != S_OK) { return nullptr; } else { - return policyConfig; + return var_policyConfig; } }