[MPlayer-cvslog] r38299 - trunk/gui/wm/ws.c
ib
subversion at mplayerhq.hu
Mon Mar 1 16:17:49 EET 2021
Author: ib
Date: Mon Mar 1 16:17:49 2021
New Revision: 38299
Log:
Don't consider MSGTR_GUI_MSG_X11Error to be a text constant.
Add it to a predefined buffer.
Modified:
trunk/gui/wm/ws.c
Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c Mon Mar 1 16:14:27 2021 (r38298)
+++ trunk/gui/wm/ws.c Mon Mar 1 16:17:49 2021 (r38299)
@@ -38,6 +38,7 @@
#include "mp_msg.h"
#include "mpbswap.h"
#include "mplayer.h"
+#include "libavutil/avstring.h"
#include "libavutil/imgutils.h"
#include "libavutil/pixfmt.h"
#include "libswscale/swscale.h"
@@ -313,11 +314,13 @@ void wsDone(void)
static int wsErrorHandler(Display *display, XErrorEvent *event)
{
char type[128];
+ char msg[80] = "[ws] ";
_XExtension *ext = NULL;
XGetErrorText(display, event->error_code, type, sizeof(type));
- mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws] " MSGTR_GUI_MSG_X11Error);
+ av_strlcat(msg, MSGTR_GUI_MSG_X11Error, sizeof(msg));
+ mp_msg(MSGT_GPLAYER, MSGL_ERR, "%s", msg);
mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws] Error code: %d - %s\n", event->error_code, type);
if (event->request_code < 128) {
More information about the MPlayer-cvslog
mailing list