From 7ca66bfe6f1634abc3f73d843e3318f98d09e278 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 2 Jan 2020 01:06:03 +0100 Subject: [PATCH] tkpanels: work around tkinter bug cancelling file open dialog on macOS Fixes #811 --- direct/src/tkpanels/AnimPanel.py | 2 +- direct/src/tkpanels/MopathRecorder.py | 2 +- direct/src/tkpanels/ParticlePanel.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/direct/src/tkpanels/AnimPanel.py b/direct/src/tkpanels/AnimPanel.py index a8348c299d..ca5cbe0d25 100644 --- a/direct/src/tkpanels/AnimPanel.py +++ b/direct/src/tkpanels/AnimPanel.py @@ -276,7 +276,7 @@ class AnimPanel(AppShell): title = 'Load Animation', parent = self.component('hull') ) - if not animFilename: + if not animFilename and animFilename != 'None': # no file selected, canceled return diff --git a/direct/src/tkpanels/MopathRecorder.py b/direct/src/tkpanels/MopathRecorder.py index 8ff2341865..1cf65cd0aa 100644 --- a/direct/src/tkpanels/MopathRecorder.py +++ b/direct/src/tkpanels/MopathRecorder.py @@ -1638,7 +1638,7 @@ class MopathRecorder(AppShell, DirectObject): initialdir = path, title = 'Load Nurbs Curve', parent = self.parent) - if mopathFilename: + if mopathFilename and mopathFilename != 'None': self.reset() nodePath = loader.loadModel( Filename.fromOsSpecific(mopathFilename)) diff --git a/direct/src/tkpanels/ParticlePanel.py b/direct/src/tkpanels/ParticlePanel.py index b7a632f61a..d82677b5e5 100644 --- a/direct/src/tkpanels/ParticlePanel.py +++ b/direct/src/tkpanels/ParticlePanel.py @@ -1272,7 +1272,7 @@ class ParticlePanel(AppShell): initialdir = path, title = 'Load Particle Effect', parent = self.parent) - if particleFilename: + if particleFilename and particleFilename != 'None': # Delete existing particles and forces self.particleEffect.loadConfig( Filename.fromOsSpecific(particleFilename))