summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoruid86226 <none@none>2002-09-09 20:43:20 +0000
committeruid86226 <none@none>2002-09-09 20:43:20 +0000
commit76343c1b719954c4d7f190a837cf7385a6a53181 (patch)
treeb25627daac773eba46fb10aaf46e003b16f2021e /src
parent5d60090ceedb89c4d87cb9ac20152c98a6224189 (diff)
downloadxine-lib-76343c1b719954c4d7f190a837cf7385a6a53181.tar.gz
xine-lib-76343c1b719954c4d7f190a837cf7385a6a53181.tar.bz2
when reading in the config file the logo callback can be called before
metronom is initialized CVS patchset: 2640 CVS date: 2002/09/09 20:43:20
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/xine.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index ae111a4b1..2035d3d03 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine.c,v 1.153 2002/09/09 19:24:48 f1rmb Exp $
+ * $Id: xine.c,v 1.154 2002/09/09 20:43:20 uid86226 Exp $
*
* top-level xine functions
*
@@ -84,7 +84,7 @@ static void _logo_change_cb(void *data, xine_cfg_entry_t *cfg) {
* current status is XINE_STATUS_STOP or XINE_STATUS_LOGO
*/
pthread_mutex_lock (&this->xine_lock);
- if((this->status == XINE_STATUS_LOGO) || (this->status == XINE_STATUS_STOP)) {
+ if(this->metronom && (this->status == XINE_STATUS_LOGO || this->status == XINE_STATUS_STOP)) {
xine_stop_internal(this);
this->metronom->adjust_clock(this->metronom,
this->metronom->get_current_time(this->metronom) + 30 * 90000 );