zjgcjy/pykd
1
0
Fork 0
mirror of https://github.com/ivellioscolin/pykd.git synced 2025-04-21 21:03:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merged from 0.3.x

Browse Source 
git-svn-id: https://pykd.svn.codeplex.com/svn@91186 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\ussrhero_cp 2017-03-02 17:32:47 +00:00 committed by Mikhail I. Izmestev
commit 260c3bc448
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pykd_ext/pyinterpret.cpp
View File

@ -205,12 +205,13 @@ public:
module = m_modules[std::make_pair(majorVersion, minorVersion)]; module = m_modules[std::make_pair(majorVersion, minorVersion)];
} }
module->PyEval_RestoreThread(module->m_globalState);
module->checkPykd();
if (global) if (global)
{ {
if (module->m_globalInterpreter == 0) if (module->m_globalInterpreter == 0)
{ {
module->PyEval_RestoreThread(module->m_globalState);
module->checkPykd();
module->m_globalInterpreter = new PythonInterpreter(module); module->m_globalInterpreter = new PythonInterpreter(module);
} }
@ -219,8 +220,6 @@ public:
} }
else else
{ {
module->PyEval_RestoreThread(module->m_globalState);
module->checkPykd();
m_currentInterpreter = new PythonInterpreter(module); m_currentInterpreter = new PythonInterpreter(module);
m_currentIsGlobal = false; m_currentIsGlobal = false;
} }

2
pykd_ext/version.h
View File

@ -3,7 +3,7 @@
#define PYKDEXT_VERSION_MAJOR 2 #define PYKDEXT_VERSION_MAJOR 2
#define PYKDEXT_VERSION_MINOR 0 #define PYKDEXT_VERSION_MINOR 0
#define PYKDEXT_VERSION_SUBVERSION 0 #define PYKDEXT_VERSION_SUBVERSION 0
#define PYKDEXT_VERSION_BUILDNO 9 #define PYKDEXT_VERSION_BUILDNO 10
#define __VER_STR2__(x) #x #define __VER_STR2__(x) #x
#define __VER_STR1__(x) __VER_STR2__(x) #define __VER_STR1__(x) __VER_STR2__(x)