From 0f734c8c5cbc45e379175916a4c942310befe747 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Mon, 3 Oct 2016 18:00:35 +0200 Subject: [PATCH] Make sure to only call Py_Initialize if Python is not initialized. --- src/libcalamares/PythonHelper.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp index 51bb03228..b252f90b2 100644 --- a/src/libcalamares/PythonHelper.cpp +++ b/src/libcalamares/PythonHelper.cpp @@ -189,7 +189,8 @@ Helper::Helper( QObject* parent ) // Let's make extra sure we only call Py_Initialize once if ( !s_instance ) { - Py_Initialize(); + if ( !Py_IsInitialized() ) + Py_Initialize(); m_mainModule = bp::import( "__main__" ); m_mainNamespace = m_mainModule.attr( "__dict__" );