From a29e8d7a648a52574fdf1fbe5358d96b647e0fad Mon Sep 17 00:00:00 2001 From: Anika Raemer Date: Wed, 5 Dec 2018 11:29:55 +0100 Subject: [PATCH] navigation behaviour update: when navigating from a selected item and choosing it again without choosing a different item in between start from where left instead of beginning --- LenaPi/controllers/MusicController.cpp | 6 ++++-- LenaPi/models/MusicModel.cpp | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/LenaPi/controllers/MusicController.cpp b/LenaPi/controllers/MusicController.cpp index 13061b6..50df601 100644 --- a/LenaPi/controllers/MusicController.cpp +++ b/LenaPi/controllers/MusicController.cpp @@ -28,8 +28,10 @@ MusicController::~MusicController() void MusicController::initPlayer(NavigationItemModel *item) { - mPlayer->stop(); - mModel->init(item); + if(item != mModel->getCurrentItem()){ + mPlayer->stop(); + mModel->init(item); + } if(!mIsMediaListSet){ mPlayer->setMediaList(mModel->getMedia()); mIsMediaListSet = true; diff --git a/LenaPi/models/MusicModel.cpp b/LenaPi/models/MusicModel.cpp index 3b7f223..93e1068 100644 --- a/LenaPi/models/MusicModel.cpp +++ b/LenaPi/models/MusicModel.cpp @@ -17,6 +17,9 @@ MusicModel::~MusicModel() void MusicModel::init(NavigationItemModel *item) { + if(mCurrentItem == item){ + return; + } mCurrentItem = item; emit currentItemChanged();