From a03fab81e7d29d92d00c4268a8fa45e16ffd84dc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 18 Mar 2013 09:36:20 +0000
Subject: - beginthread replaced with mir_forkthead - version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@4088 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/Popup/src/popup_thread.cpp | 2 +-
plugins/Popup/src/popup_wnd2.cpp | 6 +-----
plugins/Popup/src/version.h | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
(limited to 'plugins')
diff --git a/plugins/Popup/src/popup_thread.cpp b/plugins/Popup/src/popup_thread.cpp
index 13a44268ab..db5e4eb8ea 100644
--- a/plugins/Popup/src/popup_thread.cpp
+++ b/plugins/Popup/src/popup_thread.cpp
@@ -245,7 +245,7 @@ static void __cdecl PopupThread(void *arg)
}
DestroyWindow(gHwndManager); gHwndManager = NULL;
- ReleaseMutex(hThreadMutex); hThreadMutex = NULL;
+ ReleaseMutex(hThreadMutex);
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index e14ed3bda9..ba4703f153 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -186,7 +186,7 @@ PopupWnd2::~PopupWnd2()
void PopupWnd2::startThread()
{
- _beginthread(WindowThread, 0, this);
+ mir_forkthread(WindowThread, this);
}
void PopupWnd2::create()
@@ -1513,7 +1513,6 @@ LRESULT CALLBACK PopupWnd2::WindowProc(HWND hwnd, UINT message, WPARAM wParam, L
void WindowThread(void *arg)
{
- Thread_Push(0);
OleInitialize(NULL); // we may need OLE in this thread for smiley substitution
PopupWnd2 *wnd = (PopupWnd2 *)arg;
@@ -1527,9 +1526,6 @@ void WindowThread(void *arg)
TranslateMessage(&msg);
DispatchMessage(&msg);
}
-
- Thread_Pop();
- _endthread();
}
// Menu Host
diff --git a/plugins/Popup/src/version.h b/plugins/Popup/src/version.h
index 116ad90225..3fef922ed5 100644
--- a/plugins/Popup/src/version.h
+++ b/plugins/Popup/src/version.h
@@ -1,7 +1,7 @@
#define __MAJOR_VERSION 2
#define __MINOR_VERSION 1
#define __RELEASE_NUM 1
-#define __BUILD_NUM 6
+#define __BUILD_NUM 7
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
--
cgit v1.2.3