summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2016-07-16 13:38:01 +0000
committerRobert Pösel <robyer@seznam.cz>2016-07-16 13:38:01 +0000
commit954157c4f89794231ccfc9909da97d26dfea5cb1 (patch)
tree08bca8a923bf8d252504b2968b41e6a64859ee2f
parentcdab95c6d5a14ca57e8bf8c1bc7df4a0a0b91dfa (diff)
Omegle: Remove useless/broken send message lock; version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@17097 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/Omegle/src/client.h2
-rw-r--r--protocols/Omegle/src/messages.cpp2
-rw-r--r--protocols/Omegle/src/proto.cpp3
-rw-r--r--protocols/Omegle/src/version.h2
4 files changed, 1 insertions, 8 deletions
diff --git a/protocols/Omegle/src/client.h b/protocols/Omegle/src/client.h
index ee3be95567..2aae2017a8 100644
--- a/protocols/Omegle/src/client.h
+++ b/protocols/Omegle/src/client.h
@@ -43,7 +43,6 @@ public:
{
nick_ = NULL;
//msgid_ = 0;
- send_message_lock_ = NULL;
state_ = STATE_INACTIVE;
typing_ = spy_mode_ = false;
@@ -72,7 +71,6 @@ public:
std::string question_;
ptrT nick_;
- HANDLE send_message_lock_;
//int msgid_;
// State of client
diff --git a/protocols/Omegle/src/messages.cpp b/protocols/Omegle/src/messages.cpp
index b7239912a0..8cabb89dcb 100644
--- a/protocols/Omegle/src/messages.cpp
+++ b/protocols/Omegle/src/messages.cpp
@@ -27,8 +27,6 @@ void OmegleProto::SendMsgWorker(void *p)
if (p == NULL)
return;
- ScopedLock s(facy.send_message_lock_);
-
std::string data = *(std::string*)p;
delete (std::string*)p;
diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp
index bed9cdf47a..3f464a4322 100644
--- a/protocols/Omegle/src/proto.cpp
+++ b/protocols/Omegle/src/proto.cpp
@@ -29,7 +29,6 @@ PROTO<OmegleProto>(proto_name, username)
this->signon_lock_ = CreateMutex(NULL, FALSE, NULL);
this->log_lock_ = CreateMutex(NULL, FALSE, NULL);
- this->facy.send_message_lock_ = CreateMutex(NULL, FALSE, NULL);
this->facy.connection_lock_ = CreateMutex(NULL, FALSE, NULL);
this->events_loop_lock_ = CreateMutex(NULL, FALSE, NULL);
@@ -70,12 +69,10 @@ OmegleProto::~OmegleProto()
WaitForSingleObject(this->signon_lock_, IGNORE);
WaitForSingleObject(this->log_lock_, IGNORE);
- WaitForSingleObject(this->facy.send_message_lock_, IGNORE);
WaitForSingleObject(this->events_loop_lock_, IGNORE);
CloseHandle(this->signon_lock_);
CloseHandle(this->log_lock_);
- CloseHandle(this->facy.send_message_lock_);
CloseHandle(this->events_loop_lock_);
CloseHandle(this->facy.connection_lock_);
}
diff --git a/protocols/Omegle/src/version.h b/protocols/Omegle/src/version.h
index 29432052fb..2c9507ab72 100644
--- a/protocols/Omegle/src/version.h
+++ b/protocols/Omegle/src/version.h
@@ -1,7 +1,7 @@
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 1
#define __RELEASE_NUM 3
-#define __BUILD_NUM 0
+#define __BUILD_NUM 1
#include <stdver.h>