diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp index 0e8c55825..4a3112c52 100644 --- a/src/driver/volume.cpp +++ b/src/driver/volume.cpp @@ -100,8 +100,8 @@ void CVolume::setVolume(const neutrino_msg_t key) hideVolscale(); showVolscale(); - neutrino_msg_data_t data; - uint64_t timeoutEnd; + neutrino_msg_data_t data = 0; + uint64_t timeoutEnd = 0; int vol = g_settings.current_volume; do { diff --git a/src/gui/lua/lua_video.cpp b/src/gui/lua/lua_video.cpp index 8ee09629f..627cb94af 100644 --- a/src/gui/lua/lua_video.cpp +++ b/src/gui/lua/lua_video.cpp @@ -152,7 +152,8 @@ int CLuaInstVideo::PlayFile(lua_State *L) bool sp = false; if (luaL_testudata(L, 1, LUA_CLASSNAME) == NULL) - sp = D->singlePlay; + if (D) + sp = D->singlePlay; if ((sp == false) && (CMoviePlayerGui::getInstance().getBlockedFromPlugin() == false)) CMoviePlayerGui::getInstance().setBlockedFromPlugin(true); diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 38e7e7532..f6017d99f 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -2065,10 +2065,10 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/) int lastplaystop = p_movie_info ? p_movie_info->bookmarks.lastPlayStop/60:0; snprintf(play_pos, sizeof(play_pos), "%3d %s", lastplaystop, unit_short_minute); char start_pos[32] = {0}; - if (p_movie_info->bookmarks.start != 0) + if (p_movie_info && p_movie_info->bookmarks.start != 0) snprintf(start_pos, sizeof(start_pos), "%3d %s", p_movie_info->bookmarks.start/60, unit_short_minute); char end_pos[32] = {0}; - if (p_movie_info->bookmarks.end != 0) + if (p_movie_info && p_movie_info->bookmarks.end != 0) snprintf(end_pos, sizeof(end_pos), "%3d %s", p_movie_info->bookmarks.end/60, unit_short_minute); bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_LASTMOVIESTOP, isMovieBrowser, play_pos, &cSelectedMenuBookStart[1])); diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index 404a07225..6d9c12f3e 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -814,7 +814,7 @@ CTimerEvent::CTimerEvent( CTimerd::CTimerEventTypes evtype, time_t announcetime, stopTime = stoptime; repeatCount = repeatcount; previousState = CTimerd::TIMERSTATE_SCHEDULED; - +#if 0 //never used time_t diff = 0; time_t mtime = time(NULL); struct tm *tmtime = localtime(&mtime); @@ -832,6 +832,7 @@ CTimerEvent::CTimerEvent( CTimerd::CTimerEventTypes evtype, time_t announcetime, { diff+=3600; } +#endif #if 0 //FIXME EPG vs manual timer ? printf("############## CTimerEvent dst %d -> %d diff %d\n", isdst1, isdst2, diff); alarmTime += diff;