merged from 0.3.x

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

View File

@ -205,22 +205,21 @@ public:
module = m_modules[std::make_pair(majorVersion, minorVersion)];
}
module->PyEval_RestoreThread(module->m_globalState);
module->checkPykd();
if (global)
{
if (module->m_globalInterpreter == 0)
{
module->PyEval_RestoreThread(module->m_globalState);
module->checkPykd();
module->m_globalInterpreter = new PythonInterpreter(module);
}
}
m_currentInterpreter = module->m_globalInterpreter;
m_currentIsGlobal = true;
}
else
{
module->PyEval_RestoreThread(module->m_globalState);
module->checkPykd();
m_currentInterpreter = new PythonInterpreter(module);
m_currentIsGlobal = false;
}

View File

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