diff -r d14ddbfbbd36 -r c6dda2cbe081 eric6.py
--- a/eric6.py Sat Feb 16 10:27:50 2019 +0100
+++ b/eric6.py Sat Mar 02 11:15:24 2019 +0100
@@ -74,6 +74,7 @@
mainWindow = None
splash = None
inMainLoop = None
+app = None
if "--debug" in sys.argv:
del sys.argv[sys.argv.index("--debug")]
@@ -258,7 +259,7 @@
from Globals import AppInfo
import Globals
- global args, mainWindow, splash, restartArgs, inMainLoop
+ global app, args, mainWindow, splash, restartArgs, inMainLoop
sys.excepthook = excepthook
@@ -297,6 +298,9 @@
if not Globals.checkBlacklistedVersions():
sys.exit(100)
+ if "__PYVENV_LAUNCHER__" in os.environ:
+ del os.environ["__PYVENV_LAUNCHER__"]
+
from Toolbox import Startup
# set the library paths for plugins
Startup.setLibraryPaths()
