diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp index 42b9484415..cdc72b14fc 100644 --- a/Core/HW/MediaEngine.cpp +++ b/Core/HW/MediaEngine.cpp @@ -192,7 +192,7 @@ int _MpegReadbuffer(void *opaque, uint8_t *buf, int buf_size) void ffmpeg_logger(void *, int, const char *format, va_list va_args) { char tmp[1024]; vsprintf(tmp, format, va_args); - INFO_LOG(HLE, tmp); + INFO_LOG(HLE, "%s", tmp); } #endif diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index badaff66fb..ab799ddbe7 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -99,14 +99,14 @@ void ControlMapper::Refresh() { Choice *c = row->Add(new Choice(deviceName + "." + keyName, new LinearLayoutParams(1.0f))); char tagbuf[16]; - sprintf(tagbuf, "%i", i); + sprintf(tagbuf, "%i", (int)i); c->SetTag(tagbuf); c->OnClick.Handle(this, &ControlMapper::OnReplace); - + Choice *d = row->Add(new Choice("X")); d->SetTag(tagbuf); d->OnClick.Handle(this, &ControlMapper::OnDelete); - + row->Add(new Choice("+"))->OnClick.Handle(this, &ControlMapper::OnAdd); } diff --git a/lang b/lang index 595a63fccc..642cf6c141 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 595a63fccceb648c76785c6913d5e88d77daa5d6 +Subproject commit 642cf6c141b49c7b453ddaa82f4e0b08a47a3101 diff --git a/native b/native index 2ef4221395..91efd71ff9 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 2ef42213955f54e61b8599fceed7eacf0d698a31 +Subproject commit 91efd71ff9bd3b8ce879966c3f423241f4d94fd2