Mercurial > mplayer.hg
comparison gui/wm/ws.c @ 31323:c674bb16fa6d
Install error handler as early as possible to avoid crashing.
author | reimar |
---|---|
date | Sun, 13 Jun 2010 17:59:59 +0000 |
parents | c69ecf7d80a4 |
children | 7fba3e0df3cb |
comparison
equal
deleted
inserted
replaced
31322:016194f71de3 | 31323:c674bb16fa6d |
---|---|
207 { | 207 { |
208 mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_CouldNotOpenDisplay ); | 208 mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_CouldNotOpenDisplay ); |
209 exit( 0 ); | 209 exit( 0 ); |
210 } | 210 } |
211 } | 211 } |
212 | |
213 XSetErrorHandler( wsErrorHandler ); | |
212 | 214 |
213 /* enable DND atoms */ | 215 /* enable DND atoms */ |
214 wsXDNDInitialize(); | 216 wsXDNDInitialize(); |
215 | 217 |
216 { /* on remote display XShm will be disabled - LGB */ | 218 { /* on remote display XShm will be disabled - LGB */ |
328 case wsBGR15: | 330 case wsBGR15: |
329 mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr15\n" ); | 331 mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr15\n" ); |
330 wsConvFunc=rgb32tobgr15; | 332 wsConvFunc=rgb32tobgr15; |
331 break; | 333 break; |
332 } | 334 } |
333 XSetErrorHandler( wsErrorHandler ); | |
334 } | 335 } |
335 | 336 |
336 // ---------------------------------------------------------------------------------------------- | 337 // ---------------------------------------------------------------------------------------------- |
337 // Create window. | 338 // Create window. |
338 // X,Y : window position | 339 // X,Y : window position |