summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNvinside <Nvinside@eced67a3-f377-a0ae-92ae-d6de1850b05a>2011-07-04 18:31:56 +0000
committerNvinside <Nvinside@eced67a3-f377-a0ae-92ae-d6de1850b05a>2011-07-04 18:31:56 +0000
commit1ff3c50ce30716df520e7a1a3a88cb8cae33b49c (patch)
tree7c9775846b9f1bc6767dc26937e06f241f68cb15
parent8f59e5a39bd880a7b3ec6510fc550f866fd9a31c (diff)
no more 'session terminated' message on miranda im close
git-svn-id: http://mirotr.googlecode.com/svn/trunk@55 eced67a3-f377-a0ae-92ae-d6de1850b05a
-rw-r--r--MirOTR/otr.cpp4
-rw-r--r--MirOTR/svcs_proto.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/MirOTR/otr.cpp b/MirOTR/otr.cpp
index ce7ff1d..76009ac 100644
--- a/MirOTR/otr.cpp
+++ b/MirOTR/otr.cpp
@@ -268,7 +268,9 @@ extern "C" {
TCHAR buff[512];
mir_sntprintf(buff, 512, TranslateT(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT((HANDLE)opdata));
//MessageBox(0, buff, Translate("OTR Information"), MB_OK);
- ShowMessage((HANDLE)opdata, buff);
+ if(!Miranda_Terminated()) {
+ ShowMessage((HANDLE)opdata, buff);
+ }
// opdata is hContact
SetEncryptionStatus((HANDLE)opdata, otr_context_get_trust(context));
diff --git a/MirOTR/svcs_proto.cpp b/MirOTR/svcs_proto.cpp
index c4b193c..5ea6055 100644
--- a/MirOTR/svcs_proto.cpp
+++ b/MirOTR/svcs_proto.cpp
@@ -199,7 +199,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam){
tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED);
- if (tlv) {
+ if (tlv && !Miranda_Terminated()) {
/* Notify the user that the other side disconnected. */
TCHAR buff[256];
mir_sntprintf(buff, 256, TranslateT(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT(ccs->hContact));