fix bug in player module: check that movie is loaded, before assuming it's valid
Stefan Schuermans commited on 2011-12-22 23:59:49
Showing 2 changed files, with 6 additions and 1 deletions.
- src/noarch/Player.cpp 0ce20dc..5c109df
- src/noarch/PlayerMovie.cpp ad9d2ce..e963417
| ... | ... |
@@ -174,7 +174,8 @@ void Player::procFrame() |
| 174 | 174 |
if (!m_curValid) |
| 175 | 175 |
break; |
| 176 | 176 |
// movie not yet finished -> done |
| 177 |
- if (m_curFrame < BlinkenMovieGetFrameCnt(m_curEntry->m_pObj->m_pMovie)) |
|
| 177 |
+ if (m_curEntry->m_pObj->m_pMovie && |
|
| 178 |
+ m_curFrame < BlinkenMovieGetFrameCnt(m_curEntry->m_pObj->m_pMovie)) |
|
| 178 | 179 |
break; |
| 179 | 180 |
// movie finished -> next movie |
| 180 | 181 |
++m_curEntry; |
| ... | ... |
@@ -75,6 +75,10 @@ void Player::Movie::ifOnlyGoHere() |
| 75 | 75 |
m_player.m_curEntry = m_player.m_playlistTracker.m_list.begin(); |
| 76 | 76 |
m_player.m_curChange = true; |
| 77 | 77 |
} |
| 78 |
+ /* additional rule in case plalist conatins just broken/empty movies: |
|
| 79 |
+ * if current movie is not valid, trigger re-check by setting change flag */ |
|
| 80 |
+ if (!m_player.m_curValid) |
|
| 81 |
+ m_player.m_curChange = true; |
|
| 78 | 82 |
} |
| 79 | 83 |
|
| 80 | 84 |
/// if this is current movie go to begin of next movie |
| 81 | 85 |