Fix for N_SE-48378 N_SE-48015

[apps/osp/Call.git] / src / CallButtonsPanel.cpp

diff --git a/src/CallButtonsPanel.cpp b/src/CallButtonsPanel.cpp
index ab0635d..83f53cd 100644 (file)
--- a/src/CallButtonsPanel.cpp
+++ b/src/CallButtonsPanel.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
@@ -267,7 +267,7 @@ CallButtonsPanel::AddBackgroundBitmap(void)
                        Label* pBackgroundLabel = new (std::nothrow) Label();
                        pBackgroundLabel->Construct(Rectangle(0, 1, panelRect.width, panelRect.height), L"");
                        pBackgroundLabel->SetBackgroundBitmap(*pBgBitmap);
-                       r = AddControl(*pBackgroundLabel);
+                       r = AddControl(pBackgroundLabel);
 
                        //always display in background
                        SetControlAlwaysAtBottom(*pBackgroundLabel, true);
@@ -637,7 +637,7 @@ CallButtonsPanel::SetEndCallPanelState(bool isEnabled)
 
        //Video Call
        pButton = static_cast<Button*>(GetControl(IDC_VIDEOCALL_BUTTON));
-       pButton->SetEnabled(isEnabled);
+       pButton->SetEnabled(false);
 
        //Message
        pButton = static_cast<Button*>(GetControl(IDC_MSG_BUTTON));
@@ -646,6 +646,7 @@ CallButtonsPanel::SetEndCallPanelState(bool isEnabled)
        //AddToContact or Viewcontact button
        pButton = static_cast<Button*>(GetControl(IDC_ADD_TO_CONTACT_BUTTON));
        pButton->SetShowState(isEnabled);
+       pButton->SetEnabled(isEnabled);
        /*pButton->Invalidate(true);*/
 }