diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-24 15:49:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-24 16:05:50 +0100 |
| commit | 1dac3254d554a38eafeec894e8e11eb163746281 (patch) | |
| tree | 4ef1bad7b0765926d57724dfa45391067a26e2dc | |
| parent | fix broken redlines after undoing column count change (cp#1000071) (diff) | |
| download | core-1dac3254d554a38eafeec894e8e11eb163746281.tar.gz core-1dac3254d554a38eafeec894e8e11eb163746281.zip | |
allow a frame to go from init state to close
without an intermediate working stage so it can be disposed after creation, but
without a prior initialization like CppunitTest_services does
Change-Id: If2679fd0ce3657e727e34cfb0752501fc82df936
| -rw-r--r-- | framework/source/fwi/threadhelp/transactionmanager.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index 20bcdd6c020d..3d001a871997 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -74,7 +74,7 @@ void TransactionManager::setWorkingMode( EWorkingMode eMode ) // Change working mode first! if ( ( m_eWorkingMode == E_INIT && eMode == E_WORK ) || - ( m_eWorkingMode == E_WORK && eMode == E_BEFORECLOSE ) || + ( (m_eWorkingMode == E_WORK || m_eWorkingMode == E_INIT) && eMode == E_BEFORECLOSE ) || ( m_eWorkingMode == E_BEFORECLOSE && eMode == E_CLOSE ) || ( m_eWorkingMode == E_CLOSE && eMode == E_INIT ) ) |