mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-14 00:14:18 +00:00
Code Activity

FileChooser: Add assertion for improved safety when using modal FileChoosers

Browse source
This commit is contained in:
reuk 2020-10-21 13:13:53 +01:00
parent 2a638b86e7
commit b78114cfb3
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/juce_gui_basics/native/juce_mac_FileChooser.mm
View file

@ -66,13 +66,14 @@ public:
setBounds (0, 0, 0, 0);
setOpaque (true);
static DelegateClass cls;
static SafeSavePanel ssp;
static SafeOpenPanel sop;
static DelegateClass delegateClass;
static SafeSavePanel safeSavePanel;
static SafeOpenPanel safeOpenPanel;
panel = isSave ? [ssp.createInstance() init] : [sop.createInstance() init];
panel = isSave ? [safeSavePanel.createInstance() init]
: [safeOpenPanel.createInstance() init];
delegate = [cls.createInstance() init];
delegate = [delegateClass.createInstance() init];
object_setInstanceVariable (delegate, "cppObject", this);
[panel setDelegate: delegate];
@ -169,8 +170,6 @@ public:
{
if (panel != nil)
{
jassert ([panel preventsApplicationTerminationWhenModal]);
setAlwaysOnTop (juce_areThereAnyAlwaysOnTopWindows());
addToDesktop (0);
@ -184,7 +183,7 @@ public:
void runModally() override
{
jassert ([panel preventsApplicationTerminationWhenModal]);
ensurePanelSafe();
std::unique_ptr<TemporaryMainMenuWithStandardCommands> tempMenu;
@ -303,6 +302,18 @@ private:
StringArray filters;
String startingDirectory, filename;
void ensurePanelSafe()
{
// If you hit this, something (probably the plugin host) has modified the panel,
// allowing the application to terminate while the panel's modal loop is running.
// This is a very bad idea! Quitting from within the panel's modal loop may cause
// your plugin/app destructor to run directly from within `runModally`, which will
// dispose all app resources while they're still in use.
// A safer alternative is to invoke the FileChooser with `launchAsync`, rather than
// using the modal launchers.
jassert ([panel preventsApplicationTerminationWhenModal]);
}
static BOOL preventsApplicationTerminationWhenModal() { return YES; }
template <typename Base>