From 38061a6fa6dc661125175e82ff98104761acb70a Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Thu, 6 May 2010 00:35:09 +0200
Subject: [PATCH] Remove a double transaction-start (creating a nested
 transaction = bad)

--HG--
branch : trunk
---
 src/game/Mail.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp
index 624e1ae78f..d17347f94e 100644
--- a/src/game/Mail.cpp
+++ b/src/game/Mail.cpp
@@ -933,11 +933,9 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
 
     // Add to DB
     std::string safe_subject = GetSubject();
-    CharacterDatabase.BeginTransaction();
-    CharacterDatabase.escape_string(safe_subject);
-
     std::string safe_body = GetBody();
     CharacterDatabase.BeginTransaction();
+    CharacterDatabase.escape_string(safe_subject);
     CharacterDatabase.escape_string(safe_body);
 
     CharacterDatabase.PExecute("INSERT INTO mail (id,messageType,stationery,mailTemplateId,sender,receiver,subject,body,has_items,expire_time,deliver_time,money,cod,checked) "