diff --git a/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.h b/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.h index 9818b80e..5b894f3f 100644 --- a/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.h +++ b/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.h @@ -47,8 +47,7 @@ public: { if (this->active) { - this->active = false; - this->task_thread.join(); + this->exit(); } }; diff --git a/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.vcxproj b/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.vcxproj index d972523a..083a5e61 100644 --- a/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.vcxproj +++ b/vnpy/api/ctp/vnctp/vnctpmd/vnctpmd.vcxproj @@ -23,7 +23,7 @@ {F00054FF-282F-4826-848E-D58BFB9E9D9F} Win32Proj vnctpmd - 10.0.17763.0 + 10.0.17134.0 @@ -94,10 +94,10 @@ false - C:\Python37\include;$(SolutionDir);$(SolutionDir)..\include;$(SolutionDir)..\include\ctp;$(IncludePath) + C:\Miniconda3\include;$(SolutionDir);$(SolutionDir)..\include;$(SolutionDir)..\include\ctp;$(IncludePath) $(ReferencePath) .pyd - C:\Python37\libs;$(SolutionDir)..\libs;$(LibraryPath) + C:\Miniconda3\libs;$(SolutionDir)..\libs;$(LibraryPath) $(SolutionDir)..\ diff --git a/vnpy/api/ctp/vnctp/vnctptd/vnctptd.h b/vnpy/api/ctp/vnctp/vnctptd/vnctptd.h index 3277cb64..e31f58ef 100644 --- a/vnpy/api/ctp/vnctp/vnctptd/vnctptd.h +++ b/vnpy/api/ctp/vnctp/vnctptd/vnctptd.h @@ -154,8 +154,7 @@ public: { if (this->active) { - this->active = false; - this->task_thread.join(); + this->exit(); } }; diff --git a/vnpy/api/ctp/vnctp/vnctptd/vnctptd.vcxproj b/vnpy/api/ctp/vnctp/vnctptd/vnctptd.vcxproj index 9a90be18..2a61bc1d 100644 --- a/vnpy/api/ctp/vnctp/vnctptd/vnctptd.vcxproj +++ b/vnpy/api/ctp/vnctp/vnctptd/vnctptd.vcxproj @@ -23,7 +23,7 @@ {016732E6-5789-4F7C-9A1C-C46A249080CF} Win32Proj vnctptd - 10.0.17763.0 + 10.0.17134.0 @@ -94,8 +94,8 @@ false .pyd - C:\Python37\include;$(SolutionDir);$(SolutionDir)..\include;$(SolutionDir)..\include\ctp;$(IncludePath) - C:\Python37\libs;$(SolutionDir)..\libs;$(LibraryPath) + C:\Miniconda3\include;$(SolutionDir);$(SolutionDir)..\include;$(SolutionDir)..\include\ctp;$(IncludePath) + C:\Miniconda3\libs;$(SolutionDir)..\libs;$(LibraryPath) $(SolutionDir)..\ diff --git a/vnpy/api/ctp/vnctpmd.pyd b/vnpy/api/ctp/vnctpmd.pyd index 2207274e..55daf6f5 100644 Binary files a/vnpy/api/ctp/vnctpmd.pyd and b/vnpy/api/ctp/vnctpmd.pyd differ diff --git a/vnpy/api/ctp/vnctptd.pyd b/vnpy/api/ctp/vnctptd.pyd index d56c830b..df0cd159 100644 Binary files a/vnpy/api/ctp/vnctptd.pyd and b/vnpy/api/ctp/vnctptd.pyd differ