projects
/
apps
/
osp
/
Call.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for 45866
[apps/osp/Call.git]
/
src
/
CallEndCallForm.cpp
diff --git
a/src/CallEndCallForm.cpp
b/src/CallEndCallForm.cpp
index
61a0170
..
e9b3b80
100644
(file)
--- a/
src/CallEndCallForm.cpp
+++ b/
src/CallEndCallForm.cpp
@@
-229,12
+229,12
@@
EndCallForm::OnActionPerformed(const Control& source, int actionId)
if (isEmergencyCall)
{
pSceneManager->GoForward( ForwardSceneTransition( IDSCN_SCENE_OUT_EMERGENCYCALL,
if (isEmergencyCall)
{
pSceneManager->GoForward( ForwardSceneTransition( IDSCN_SCENE_OUT_EMERGENCYCALL,
- SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_
KEEP
), pContact);
+ SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_
DESTROY
), pContact);
}
else
{
pSceneManager->GoForward( ForwardSceneTransition(IDSCN_SCENE_OUTCALL,
}
else
{
pSceneManager->GoForward( ForwardSceneTransition(IDSCN_SCENE_OUTCALL,
- SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_
KEEP
), pContact);
+ SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_
DESTROY
), pContact);
}
}
else
}
}
else
@@
-749,7
+749,7
@@
EndCallForm::OnForeground(void)
}
//Enable all buttons
Button* pButton = static_cast<Button*>(GetControl(IDC_VIDEOCALL_BUTTON,true));
}
//Enable all buttons
Button* pButton = static_cast<Button*>(GetControl(IDC_VIDEOCALL_BUTTON,true));
- pButton->SetEnabled(
tru
e);
+ pButton->SetEnabled(
fals
e);
pButton->Invalidate(true);
pButton = static_cast<Button*>(GetControl(IDC_VOICECALL_BUTTON,true));
pButton->SetEnabled(true);
pButton->Invalidate(true);
pButton = static_cast<Button*>(GetControl(IDC_VOICECALL_BUTTON,true));
pButton->SetEnabled(true);