equal
deleted
inserted
replaced
163 |
163 |
164 switch( aNotification ) |
164 switch( aNotification ) |
165 { |
165 { |
166 case ECalenNotifyAppForegrounded: |
166 case ECalenNotifyAppForegrounded: |
167 { |
167 { |
168 SetCurrentState( aStateMachine, iPreviousState ); |
168 if( iPreviousState == CCalenStateMachine::ECalenSendingState ) |
|
169 { |
|
170 SetCurrentState( aStateMachine, CCalenStateMachine::ECalenIdleState ); |
|
171 } |
|
172 else |
|
173 { |
|
174 SetCurrentState( aStateMachine, iPreviousState ); |
|
175 } |
169 // We set iOutstandingNotifications for two reasons. |
176 // We set iOutstandingNotifications for two reasons. |
170 // 1. The new state i.e. the state we are moving back can have notification info. |
177 // 1. The new state i.e. the state we are moving back can have notification info. |
171 // 2. When we move to newstate we broadcast all notification from iOutstandingNotifications |
178 // 2. When we move to newstate we broadcast all notification from iOutstandingNotifications |
172 // and inform the registered notifiers. |
179 // and inform the registered notifiers. |
173 iOutstandingNotifications.InsertL(aNotification); |
180 iOutstandingNotifications.InsertL(aNotification); |