VKontakte:

fix (?) restart longpoolserver on speedy status change
update VK_API_VER to 5.60
version bump

3 files changed, 4 insertions, 3 deletions

diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h
index ebbcc0293c..167af8b3f9 100644
--- a/protocols/VKontakte/src/version.h
+++ b/protocols/VKontakte/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0

 #define __MINOR_VERSION          1

 #define __RELEASE_NUM            2

-#define __BUILD_NUM              7

+#define __BUILD_NUM              8

 

 #include <stdver.h>

 

diff --git a/protocols/VKontakte/src/vk.h b/protocols/VKontakte/src/vk.h
index 509ff56ff2..84186543a5 100644
--- a/protocols/VKontakte/src/vk.h
+++ b/protocols/VKontakte/src/vk.h
@@ -82,7 +82,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #define VK_USER_DEACTIVATE_ACTION	9321

 

-#define VK_API_VER "5.59"

+#define VK_API_VER "5.60"

 #define VER_API CHAR_PARAM("v", VK_API_VER)

 

 #define VK_FEED_USER 2147483647L

diff --git a/protocols/VKontakte/src/vk_pollserver.cpp b/protocols/VKontakte/src/vk_pollserver.cpp
index 372a73e92f..e4a3b5524b 100644
--- a/protocols/VKontakte/src/vk_pollserver.cpp
+++ b/protocols/VKontakte/src/vk_pollserver.cpp
@@ -211,6 +211,7 @@ int CVkProto::PollServer()
 		}

 		else {

 			debugLogA("CVkProto::PollServer => ShutdownSession");

+			m_hPollingThread = NULL;

 			ShutdownSession();

 			return 0;

 		}

@@ -256,7 +257,7 @@ void CVkProto::PollingThread(void*)
 	debugLogA("CVkProto::PollingThread: entering");

 

 	while (!m_bTerminated)

-		if (PollServer() == -1)

+		if (PollServer() == -1 || !m_hPollingThread)

 			break;

 

 	m_hPollingThread = NULL;