summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2009-12-29 13:56:14 +0000
committerphintuka <phintuka>2009-12-29 13:56:14 +0000
commit1eeb1b5533bb47121801bebd5bf0068648a39c63 (patch)
tree6d12d54197021d3aa8ade37d9565e14362ef0679
parent9bbc137fb79b2e40f412b1eec7dc5d8fdba85905 (diff)
downloadxineliboutput-1eeb1b5533bb47121801bebd5bf0068648a39c63.tar.gz
xineliboutput-1eeb1b5533bb47121801bebd5bf0068648a39c63.tar.bz2
fe_is_finished(): user-requested exit has higher priority than playback errors.
(user-requested exit does not trigger re-connect)
-rw-r--r--xine_frontend.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/xine_frontend.c b/xine_frontend.c
index 657fe7bb..216a1e78 100644
--- a/xine_frontend.c
+++ b/xine_frontend.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_frontend.c,v 1.104 2009-12-29 13:48:48 phintuka Exp $
+ * $Id: xine_frontend.c,v 1.105 2009-12-29 13:56:14 phintuka Exp $
*
*/
@@ -1211,10 +1211,12 @@ static int fe_is_finished(frontend_t *this_gen, int slave_stream)
{
fe_t *this = (fe_t*)this_gen;
- if(!this || this->playback_finished)
+ if (!this)
return FE_XINE_ERROR;
if (this->terminate_key_pressed)
return FE_XINE_EXIT;
+ if (this->playback_finished)
+ return FE_XINE_ERROR;
if (slave_stream) {
if (!this->slave_stream || this->slave_playback_finished)