equal
deleted
inserted
replaced
1181 { |
1181 { |
1182 TN_DEBUG1( "CThumbAGProcessor::RunL() - *** FORCED RUN ***"); |
1182 TN_DEBUG1( "CThumbAGProcessor::RunL() - *** FORCED RUN ***"); |
1183 } |
1183 } |
1184 #endif |
1184 #endif |
1185 |
1185 |
1186 if( iForceRun || iForegroundRun ) |
1186 if( (iForceRun || iForegroundRun ) && !iMountTimer->IsActive() ) |
1187 { |
1187 { |
1188 TN_DEBUG1( "void CThumbAGProcessor::RunL() skip idle detection!"); |
1188 TN_DEBUG1( "void CThumbAGProcessor::RunL() skip idle detection!"); |
1189 CancelTimeout(); |
1189 CancelTimeout(); |
1190 } |
1190 } |
1191 else |
1191 else |
1683 TN_DEBUG1( "CThumbAGProcessor::ActivateAO() - FORMATTING - DAEMON ON PAUSE"); |
1683 TN_DEBUG1( "CThumbAGProcessor::ActivateAO() - FORMATTING - DAEMON ON PAUSE"); |
1684 return; |
1684 return; |
1685 } |
1685 } |
1686 |
1686 |
1687 //check if forced run needs to continue |
1687 //check if forced run needs to continue |
1688 if ( iModifyItemCount > 0 || iUnknownItemCount > 0 || iDeleteItemCount > 0 ) |
1688 if ( (iModifyItemCount > 0 || iDeleteItemCount > 0 || iUnknownItemCount > 0) && !iMountTimer->IsActive()) |
1689 { |
1689 { |
1690 TN_DEBUG1( "CThumbAGProcessor::ActivateAO() - iModifyItemCount > 0 || iUnknownItemCount > 0 || iDeleteItemCount > 0"); |
1690 TN_DEBUG1( "CThumbAGProcessor::ActivateAO() - forced run"); |
1691 SetForceRun( ETrue ); |
1691 SetForceRun( ETrue ); |
1692 } |
1692 } |
1693 else |
1693 else |
1694 { |
1694 { |
1695 iModify = EFalse; |
1695 iModify = EFalse; |
1696 SetForceRun( EFalse ); |
1696 SetForceRun( EFalse ); |
1697 } |
1697 } |
1698 |
1698 |
1699 if( !IsActive() && !iShutdown && ((iActiveCount == 0 && !iQueryActive) || iForceRun )) |
1699 if( !IsActive() && !iShutdown && ((iActiveCount < KMaxDaemonRequests && !iQueryActive) || iForceRun )) |
1700 { |
1700 { |
1701 TN_DEBUG1( "CThumbAGProcessor::ActivateAO() - Activated"); |
1701 TN_DEBUG1( "CThumbAGProcessor::ActivateAO() - Activated"); |
1702 SetActive(); |
1702 SetActive(); |
1703 TRequestStatus* statusPtr = &iStatus; |
1703 TRequestStatus* statusPtr = &iStatus; |
1704 User::RequestComplete( statusPtr, KErrNone ); |
1704 User::RequestComplete( statusPtr, KErrNone ); |
2015 void CThumbAGProcessor::FormatNotification( TBool aFormat ) |
2015 void CThumbAGProcessor::FormatNotification( TBool aFormat ) |
2016 { |
2016 { |
2017 TN_DEBUG2( "CThumbAGProcessor::FormatNotification(%d)", aFormat ); |
2017 TN_DEBUG2( "CThumbAGProcessor::FormatNotification(%d)", aFormat ); |
2018 |
2018 |
2019 iFormatting = aFormat; |
2019 iFormatting = aFormat; |
|
2020 |
2020 if(!aFormat) |
2021 if(!aFormat) |
2021 { |
2022 { |
|
2023 //force update |
|
2024 UpdatePSValues(EFalse, ETrue); |
2022 ActivateAO(); |
2025 ActivateAO(); |
2023 } |
2026 } |
2024 } |
2027 } |
2025 |
2028 |
2026 // --------------------------------------------------------------------------- |
2029 // --------------------------------------------------------------------------- |
2125 { |
2128 { |
2126 TN_DEBUG3( "CThumbAGProcessor::UpdatePSValues() set KDaemonProcessing %d failed %d", daemonProcessing, ret); |
2129 TN_DEBUG3( "CThumbAGProcessor::UpdatePSValues() set KDaemonProcessing %d failed %d", daemonProcessing, ret); |
2127 } |
2130 } |
2128 } |
2131 } |
2129 |
2132 |
|
2133 TN_DEBUG2( "CThumbAGProcessor::UpdatePSValues() iPreviousItemsLeft == %d", iPreviousItemsLeft); |
|
2134 |
2130 if( itemsLeft != iPreviousItemsLeft) |
2135 if( itemsLeft != iPreviousItemsLeft) |
2131 { |
2136 { |
2132 TN_DEBUG2( "CThumbAGProcessor::UpdatePSValues() update KItemsleft == %d", itemsLeft); |
2137 TN_DEBUG2( "CThumbAGProcessor::UpdatePSValues() Set KItemsleft == %d", itemsLeft); |
2133 iPreviousItemsLeft = itemsLeft; |
2138 iPreviousItemsLeft = itemsLeft; |
2134 TInt ret = RProperty::Set(KTAGDPSNotification, KItemsleft, itemsLeft ); |
2139 TInt ret = RProperty::Set(KTAGDPSNotification, KItemsleft, itemsLeft ); |
2135 |
2140 |
2136 if(ret != KErrNone ) |
2141 if(ret != KErrNone ) |
2137 { |
2142 { |