From 210cbdca66e2277e3d40237d5af2f2753a79e68c Mon Sep 17 00:00:00 2001 From: reuk Date: Thu, 28 Oct 2021 11:41:39 +0100 Subject: [PATCH] FileBasedDocument: Show correct error text in alert window if loadDocument fails --- .../juce_gui_extra/documents/juce_FileBasedDocument.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp b/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp index bd1a1aede8..2c966ee3a9 100644 --- a/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp +++ b/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp @@ -326,7 +326,7 @@ private: auto oldFile = documentFile; documentFile = newFile; - auto tidyUp = [parent, newFile, oldFile, showMessageOnFailure, showWaitCursor, completed] + auto tidyUp = [parent, newFile, oldFile, showMessageOnFailure, showWaitCursor, completed] (Result result) { if (parent.shouldExitAsyncCallback()) return; @@ -336,8 +336,6 @@ private: if (showWaitCursor) MouseCursor::hideWaitCursor(); - auto result = Result::fail (TRANS ("The file doesn't exist")); - if (showMessageOnFailure) AlertWindow::showMessageBoxAsync (MessageBoxIconType::WarningIcon, TRANS ("Failed to open file..."), @@ -373,7 +371,7 @@ private: return; } - tidyUp(); + tidyUp (result); }; doLoadDocument (newFile, std::move (afterLoading)); @@ -381,7 +379,7 @@ private: return; } - tidyUp(); + tidyUp (Result::fail (TRANS ("The file doesn't exist"))); } //==============================================================================