TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

direct: Resolve DirectScrolledFrame crash on destroy

Browse Source 
Destroying DirectScrolledFrames currently crashes the game, because they are destroyed twice. This commit makes sure to destroy the scrolls only once.

Closes #574
This commit is contained in:
Derzsi Dániel 2019-03-04 00:21:23 +02:00 committed by rdb
parent 155b1c38ad
commit c337e58f4d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
direct/src/gui/DirectScrolledFrame.py
View File

@ -100,8 +100,10 @@ class DirectScrolledFrame(DirectFrame):
simpleChildGui = self.guiDict.get(parts[-1]) simpleChildGui = self.guiDict.get(parts[-1])
if simpleChildGui: if simpleChildGui:
simpleChildGui.destroy() simpleChildGui.destroy()
self.verticalScroll.destroy() if self.verticalScroll:
self.horizontalScroll.destroy() self.verticalScroll.destroy()
del self.verticalScroll if self.horizontalScroll:
del self.horizontalScroll self.horizontalScroll.destroy()
self.verticalScroll = None
self.horizontalScroll = None
DirectFrame.destroy(self) DirectFrame.destroy(self)