fix(ServerImpl): do finalization before exit process

rime · Feb 26, 2018 · b1bae01 · b1bae01
1 parent ae2e3c4
commit b1bae01
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/WeaselIPC/PipeChannel.cpp b/WeaselIPC/PipeChannel.cpp
@@ -8,7 +8,7 @@ using namespace boost;
 
 #define _ThrowLastError throw ::GetLastError()
 #define _ThrowCode(__c) throw __c
-#define _ThrowIfNot(__c) { DWORD err; if ((err = ::GetLastError()) != __c) throw __c; }
+#define _ThrowIfNot(__c) { DWORD err; if ((err = ::GetLastError()) != __c) throw err; }
 
 PipeChannelBase::PipeChannelBase(std::wstring &pn_cmd, size_t bs = 4 * 1024, SECURITY_ATTRIBUTES *s = NULL)
 	: pname(pn_cmd),

diff --git a/WeaselIPCServer/WeaselServerImpl.cpp b/WeaselIPCServer/WeaselServerImpl.cpp
@@ -36,6 +36,11 @@ ServerImpl::ServerImpl()
 }
 
 ServerImpl::~ServerImpl()
+{
+	_Finailize();
+}
+
+void ServerImpl::_Finailize()
 {
 	if (pipeThread != nullptr) {
 		pipeThread->interrupt();
@@ -120,14 +125,7 @@ int ServerImpl::Start()
 
 int ServerImpl::Stop()
 {
-	if (pipeThread != nullptr) {
-		pipeThread->interrupt();
-	}
-	if (IsWindow())
-	{
-		DestroyWindow();
-	}
-
+	_Finailize();
 	// quit the server
 	::ExitProcess(0);
 	return 0;
@@ -160,6 +158,7 @@ int ServerImpl::Run()
 }
 
 
+
 DWORD ServerImpl::OnEcho(WEASEL_IPC_COMMAND uMsg, DWORD wParam, DWORD lParam)
 {
 	if (!m_pRequestHandler)

diff --git a/WeaselIPCServer/WeaselServerImpl.h b/WeaselIPCServer/WeaselServerImpl.h
@@ -67,6 +67,7 @@ namespace weasel
 		}
 
 	private:
+		void _Finailize();
 		template<typename _Resp>
 		void HandlePipeMessage(PipeMessage pipe_msg, _Resp resp);