napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure to only call Py_Initialize if Python is not initialized.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-10-03 18:00:35 +02:00
parent 553062fc11
commit 0f734c8c5c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcalamares/PythonHelper.cpp
View File

@ -189,7 +189,8 @@ Helper::Helper( QObject* parent )
// Let's make extra sure we only call Py_Initialize once // Let's make extra sure we only call Py_Initialize once
if ( !s_instance ) if ( !s_instance )
{ {
Py_Initialize(); if ( !Py_IsInitialized() )
Py_Initialize();
m_mainModule = bp::import( "__main__" ); m_mainModule = bp::import( "__main__" );
m_mainNamespace = m_mainModule.attr( "__dict__" ); m_mainNamespace = m_mainModule.attr( "__dict__" );