diff --git a/src/gui/lua/lua_api_version.h b/src/gui/lua/lua_api_version.h index 28aa21d52..54fa105fa 100644 --- a/src/gui/lua/lua_api_version.h +++ b/src/gui/lua/lua_api_version.h @@ -4,4 +4,4 @@ * to luainstance.h changes */ #define LUA_API_VERSION_MAJOR 1 -#define LUA_API_VERSION_MINOR 67 +#define LUA_API_VERSION_MINOR 68 diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 3680a5573..e6c5b24c4 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1524,38 +1524,41 @@ void CMoviePlayerGui::PlayFileLoop(void) SetPosition(1000 * (hh * 3600 + mm * 60 + ss), true); } else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) { + if (fromInfoviewer) { #ifdef ENABLE_LUA - if (isLuaPlay && haveLuaInfoFunc) { - CTimeOSD::mode m_mode = FileTime.getMode(); - bool restore = FileTime.IsVisible(); - if (restore) - FileTime.kill(); - CInfoClock::getInstance()->enableInfoClock(false); + if (isLuaPlay && haveLuaInfoFunc) { + CTimeOSD::mode m_mode = FileTime.getMode(); + bool restore = FileTime.IsVisible(); + if (restore) + FileTime.kill(); + CInfoClock::getInstance()->enableInfoClock(false); - int xres = 0, yres = 0, aspectRatio = 0, framerate = -1; - if (!videoDecoder->getBlank()) { - videoDecoder->getPictureInfo(xres, yres, framerate); - if (yres == 1088) - yres = 1080; - aspectRatio = videoDecoder->getAspectRatio(); + int xres = 0, yres = 0, aspectRatio = 0, framerate = -1; + if (!videoDecoder->getBlank()) { + videoDecoder->getPictureInfo(xres, yres, framerate); + if (yres == 1088) + yres = 1080; + aspectRatio = videoDecoder->getAspectRatio(); + } + CLuaInstVideo::getInstance()->execLuaInfoFunc(luaState, xres, yres, aspectRatio, framerate); + fromInfoviewer = false; + + CInfoClock::getInstance()->enableInfoClock(true); + if (restore) { + FileTime.setMode(m_mode); + FileTime.update(position, duration); + } } - CLuaInstVideo::getInstance()->execLuaInfoFunc(luaState, xres, yres, aspectRatio, framerate); - - CInfoClock::getInstance()->enableInfoClock(true); - if (restore) { - FileTime.setMode(m_mode); - FileTime.update(position, duration); - } - - } else { + else { #endif - if (fromInfoviewer) { g_EpgData->show_mp(p_movie_info,GetPosition(),GetDuration()); fromInfoviewer = false; +#ifdef ENABLE_LUA } - else - callInfoViewer(); +#endif } + else + callInfoViewer(); update_lcd = true; clearSubtitle(); } else if (timeshift != TSHIFT_MODE_OFF && (msg == CRCInput::RC_text || msg == CRCInput::RC_epg || msg == NeutrinoMessages::SHOW_EPG)) {