From 34d0490c212a89a3a2f4dc727b8826c6cf1ced42 Mon Sep 17 00:00:00 2001 From: Kim Tae Soo Date: Wed, 29 Apr 2015 14:12:32 +0900 Subject: [PATCH] Fix runtime error: When t_OnUpdate is called with updateType of E_FOCUS_UPDATE, keyEvent should be specified. Change-Id: Ifa261af527ff7f782ac91e89751ee09b6e5a5d57 Signed-off-by: Kim Tae Soo --- src/views/album-layout.cpp | 1 + src/views/album-songs-layout.cpp | 2 +- src/views/category-layout.cpp | 1 + src/views/category-songs-layout.cpp | 2 +- src/views/folder-layout.cpp | 1 + src/views/song-layout.cpp | 2 ++ 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/album-layout.cpp b/src/views/album-layout.cpp index 348452a..66a1a71 100644 --- a/src/views/album-layout.cpp +++ b/src/views/album-layout.cpp @@ -602,6 +602,7 @@ void CAlbumLayout::OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey SParcel parcel; memset(&parcel, 0, sizeof(SParcel)); parcel.updateType = E_FOCUS_UPDATE; + parcel.keyEvent = SKEY_BACK; m->vmgr->UpdateView((const char *)MUSIC_BASE_VIEW, &parcel); break; diff --git a/src/views/album-songs-layout.cpp b/src/views/album-songs-layout.cpp index 16d2b70..d09ce7f 100644 --- a/src/views/album-songs-layout.cpp +++ b/src/views/album-songs-layout.cpp @@ -672,7 +672,7 @@ void CAlbumSongsLayout::OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event switch (ev->skey) { case SKEY_LEFT: parcel.updateType = E_FOCUS_UPDATE; - parcel.keyEvent = SKEY_MAX; + parcel.keyEvent = SKEY_LEFT; m->vmgr->UpdateView(MUSIC_BASE_VIEW, &parcel); break; diff --git a/src/views/category-layout.cpp b/src/views/category-layout.cpp index d5140db..b04d175 100644 --- a/src/views/category-layout.cpp +++ b/src/views/category-layout.cpp @@ -1290,6 +1290,7 @@ void CCategoryLayout::OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_S SParcel parcel; memset(&parcel, 0, sizeof(SParcel)); parcel.updateType = E_FOCUS_UPDATE; + parcel.keyEvent = SKEY_BACK; m->vmgr->UpdateView((const char *)MUSIC_BASE_VIEW, &parcel); return; } diff --git a/src/views/category-songs-layout.cpp b/src/views/category-songs-layout.cpp index 0462b60..8c7ab9f 100644 --- a/src/views/category-songs-layout.cpp +++ b/src/views/category-songs-layout.cpp @@ -1020,7 +1020,7 @@ void CCategorySongsLayout::OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Ev switch (ev->skey) { case SKEY_LEFT: parcel.updateType = E_FOCUS_UPDATE; - parcel.keyEvent = SKEY_MAX; + parcel.keyEvent = SKEY_LEFT; m->vmgr->UpdateView(MUSIC_BASE_VIEW, &parcel); break; diff --git a/src/views/folder-layout.cpp b/src/views/folder-layout.cpp index 33c152d..e6ba390 100644 --- a/src/views/folder-layout.cpp +++ b/src/views/folder-layout.cpp @@ -951,6 +951,7 @@ void CFolderLayout::OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKe SParcel parcel; memset(&parcel, 0, sizeof(SParcel)); parcel.updateType = E_FOCUS_UPDATE; + parcel.keyEvent = SKEY_BACK; m->vmgr->UpdateView((const char *)MUSIC_BASE_VIEW, &parcel); } break; diff --git a/src/views/song-layout.cpp b/src/views/song-layout.cpp index 89222e2..f1a6df1 100644 --- a/src/views/song-layout.cpp +++ b/src/views/song-layout.cpp @@ -543,6 +543,7 @@ bool CSongLayout::Create(CLayoutMgr *mgr, const char *uri) memset(&parcel, 0, sizeof(SParcel)); parcel.updateType = E_FOCUS_UPDATE; parcel.layoutId = MUSIC_SONG_LAYOUT; + parcel.keyEvent = SKEY_MAX; m->vmgr->UpdateView((const char *)MUSIC_BASE_VIEW, &parcel); } @@ -626,6 +627,7 @@ void CSongLayout::OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_ SParcel parcel; memset(&parcel, 0, sizeof(SParcel)); parcel.updateType = E_FOCUS_UPDATE; + parcel.keyEvent = SKEY_BACK; m->vmgr->UpdateView((const char *)MUSIC_BASE_VIEW, &parcel); break; -- 2.7.4