git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@1951...

diff --git a/protocol/amcp/AMCPCommandQueue.cpp b/protocol/amcp/AMCPCommandQueue.cpp
index 0d4b500dcb6662c27e730c3797064118169f27b9..a77adf54bfa881a5ae5a8474bbb0c792874280dc 100644 (file)
--- a/protocol/amcp/AMCPCommandQueue.cpp
+++ b/protocol/amcp/AMCPCommandQueue.cpp
@@ -44,10 +44,17 @@ void AMCPCommandQueue::AddCommand(AMCPCommandPtr pCurrentCommand)
 \r
        if(executor_.size() > 64)\r
        {\r
-               CASPAR_LOG(error) << "AMCP Command Queue Overflow.";\r
-               CASPAR_LOG(error) << "Failed to execute command:" << pCurrentCommand->print();\r
-               pCurrentCommand->SetReplyString(L"500 FAILED");\r
-               pCurrentCommand->SendReply();\r
+               try\r
+               {\r
+                       CASPAR_LOG(error) << "AMCP Command Queue Overflow.";\r
+                       CASPAR_LOG(error) << "Failed to execute command:" << pCurrentCommand->print();\r
+                       pCurrentCommand->SetReplyString(L"500 FAILED");\r
+                       pCurrentCommand->SendReply();\r
+               }\r
+               catch(...)\r
+               {\r
+                       CASPAR_LOG_CURRENT_EXCEPTION();\r
+               }\r
        }\r
        \r
        executor_.begin_invoke([=]\r