From f32c8783ee2ad07daf13fbbda12c66ea77ce03a6 Mon Sep 17 00:00:00 2001 From: Thorvald Natvig Date: Sat, 25 Apr 2009 21:26:33 +0200 Subject: [PATCH] Intel C++ 11.0.074 for releases, and fix a bug with linked speaking --- installer/Mumble.nsi | 2 +- src/murmur/Server.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/Mumble.nsi b/installer/Mumble.nsi index 12e39c423..d815260e7 100644 --- a/installer/Mumble.nsi +++ b/installer/Mumble.nsi @@ -146,7 +146,7 @@ Section "" SectionCommon File "\dev\dbus\bin\dbus-daemon.exe" File "\dev\dbus\etc\session.conf" - File "\Program Files (x86)\Intel\Compiler\11.0\072\cpp\Bin\ia32\libmmd.dll" + File "\Program Files (x86)\Intel\Compiler\11.0\074\cpp\Bin\ia32\libmmd.dll" File "Microsoft.VC90.CRT.manifest" File "\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvcm90.dll" diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index 70e5544eb..269d5fb40 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -538,7 +538,7 @@ void Server::processMsg(User *u, const char *data, int len) { foreach(Channel *l, chans) { if (ChanACL::hasPermission(u, l, (target == 1) ? ChanACL::AltSpeak : ChanACL::Speak, acCache)) { foreach(p, l->qlPlayers) { - User *pDst = static_cast(pDst); + User *pDst = static_cast(p); if (! p->bDeaf && ! p->bSelfDeaf) { if (poslen && pDst->ssContext == u->ssContext) sendMessage(pDst, buffer, len, qba);