Merge branch 'cst-next' into nmp-cst-next

Origin commit data
------------------
Commit: ed99066466
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
This commit is contained in:
Michael Liebmann
2016-01-26 06:55:54 +01:00
9 changed files with 36 additions and 24 deletions

View File

@@ -3329,7 +3329,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
lastMode=mode;
mode=mode_pic;
}
if((data & mode_mask)== mode_ts && CMoviePlayerGui::getInstance().Playing()) {
if((data & mode_mask)== mode_ts) {
if(mode == mode_radio)
frameBuffer->stopFrame();
lastMode=mode;