From aa90b7b0c052cc8b067d4ad960664b8b40dd8716 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Fri, 23 Feb 2018 22:25:24 +0100
Subject: [PATCH] showbase: disable track-gui-items by default, remove
 want-e3-hacks

---
 direct/src/gui/DirectGuiBase.py | 2 +-
 direct/src/showbase/ShowBase.py | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/direct/src/gui/DirectGuiBase.py b/direct/src/gui/DirectGuiBase.py
index a0f153d07e..3180d0dfce 100644
--- a/direct/src/gui/DirectGuiBase.py
+++ b/direct/src/gui/DirectGuiBase.py
@@ -729,7 +729,7 @@ class DirectGuiWidget(DirectGuiBase, NodePath):
             guiObjectCollector.addLevel(1)
             guiObjectCollector.flushLevel()
             # track gui items by guiId for tracking down leaks
-            if ShowBase.config.GetBool('track-gui-items', True):
+            if ShowBase.config.GetBool('track-gui-items', False):
                 if not hasattr(ShowBase, 'guiItems'):
                     ShowBase.guiItems = {}
                 if self.guiId in ShowBase.guiItems:
diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index fd25018634..42ee315909 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -397,11 +397,10 @@ class ShowBase(DirectObject.DirectObject):
 
         self.createBaseAudioManagers()
 
-        if self.__dev__ or self.config.GetBool('want-e3-hacks', False):
-            if self.config.GetBool('track-gui-items', True):
-                # dict of guiId to gui item, for tracking down leaks
-                if not hasattr(ShowBase, 'guiItems'):
-                    ShowBase.guiItems = {}
+        if self.__dev__ and self.config.GetBool('track-gui-items', False):
+            # dict of guiId to gui item, for tracking down leaks
+            if not hasattr(ShowBase, 'guiItems'):
+                ShowBase.guiItems = {}
 
         # optionally restore the default gui sounds from 1.7.2 and earlier
         if ConfigVariableBool('orig-gui-sounds', False).getValue():