diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-01-30 19:00:00 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-01-30 19:00:38 +0100 |
| commit | 6c779863bbd25499f4c7dff7d201403ebef898be (patch) | |
| tree | 346dc9972831c520473e521e9e02021c66f36cf2 /vcl/win | |
| parent | 1f2bf6d863a25475f27e2b0d37f8c36aec74d6d4 (diff) | |
Fix "Found duplicate branches for if and else"
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index bf1b89f02398..196b013083df 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -332,27 +332,10 @@ bool WinSalInstance::CheckYieldMutex() bool bRet = true; SalData* pSalData = GetSalData(); DWORD nCurThreadId = GetCurrentThreadId(); - if ( pSalData->mnAppThreadId != nCurThreadId ) - { - if ( pSalData->mpFirstInstance ) - { - SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; - if ( pYieldMutex->mnThreadId != nCurThreadId ) - { - bRet = false; - } - } - } - else + if ( pSalData->mpFirstInstance ) { - if ( pSalData->mpFirstInstance ) - { - SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; - if ( pYieldMutex->mnThreadId != nCurThreadId ) - { - bRet = false; - } - } + SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; + bRet = (pYieldMutex->mnThreadId == nCurThreadId); } return bRet; } |