mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

avoid null pointer use

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fb4e1b78e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-21 (Thu, 21 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2016-04-21 15:29:18 +02:00
parent d44c7b1a9d
commit bc92bf0e62
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/movieplayer.cpp
View File

@@ -1055,7 +1055,8 @@ void CMoviePlayerGui::stopPlayBack(void)
printf("%s: this %p join background thread %lx\n", __func__, this, bgThread);fflush(stdout);
mutex.lock();
webtv_started = false;
playback->RequestAbort();
if(playback)
playback->RequestAbort();
mutex.unlock();
cond.broadcast();
pthread_join(bgThread, NULL);
@@ -1832,7 +1833,7 @@ void CMoviePlayerGui::selectAudioPid()
APIDSelector.addItem(item, defpid);
}
int percent[numpida];
int percent[numpida+1];
if (p_movie_info && numpida <= p_movie_info->audioPids.size()) {
APIDSelector.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_AUDIOMENU_VOLUME_ADJUST));
@@ -2061,7 +2062,8 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
#endif
const char *unit_short_minute = g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE);
char play_pos[32];
snprintf(play_pos, sizeof(play_pos), "%3d %s", p_movie_info->bookmarks.lastPlayStop/60, unit_short_minute);
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)
snprintf(start_pos, sizeof(start_pos), "%3d %s", p_movie_info->bookmarks.start/60, unit_short_minute);