diff -r 22cc52eade9b -r 1eef62f5c541 phoneapp/phoneuiview2/src/phoneuiqtview.cpp --- a/phoneapp/phoneuiview2/src/phoneuiqtview.cpp Fri Aug 06 13:16:44 2010 +0300 +++ b/phoneapp/phoneuiview2/src/phoneuiqtview.cpp Mon Aug 23 15:42:12 2010 +0300 @@ -61,7 +61,7 @@ setTitle(networkName); // Capturing long press of end key - m_keyCapture = new XqKeyCapture(); + m_keyCapture = new XQKeyCapture(); // Dialpad m_dialpad = new Dialpad(m_window); @@ -189,17 +189,19 @@ if (mapper) { QList *actions = m_bubbleActionMap.value(bubbleId); + if (actions) { + foreach (HbAction *action, *actions ) { + mapper->removeMappings(action); + } - foreach (HbAction *action, *actions ) { - mapper->removeMappings(action); - delete action; + qDeleteAll(*actions); + actions->clear(); + delete actions; } - - actions->clear(); + m_bubbleMap.remove(bubbleId); m_bubbleActionMap.remove(bubbleId); delete mapper; - delete actions; } }