From 3536cf969f1d0b043839f16fd99bb9f806966d89 Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 8 Jun 2020 15:24:53 +0100 Subject: [PATCH] Projucer: Only close window if one was opened when creating a project from clipboard contents --- .../Source/Application/jucer_Application.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/extras/Projucer/Source/Application/jucer_Application.cpp b/extras/Projucer/Source/Application/jucer_Application.cpp index c07749b5f5..cf7ea8a019 100644 --- a/extras/Projucer/Source/Application/jucer_Application.cpp +++ b/extras/Projucer/Source/Application/jucer_Application.cpp @@ -1154,12 +1154,23 @@ void ProjucerApplication::createNewProjectFromClipboard() tempFile.create(); tempFile.appendText (SystemClipboard::getTextFromClipboard()); - if (! mainWindowList.openFile (tempFile)) + String errorString; + + if (! isPIPFile (tempFile)) { - AlertWindow::showMessageBoxAsync (AlertWindow::WarningIcon, "Error", "Couldn't create project from clipboard contents."); - tempFile.deleteFile(); + errorString = "Clipboard does not contain a valid PIP."; + } + else if (! mainWindowList.openFile (tempFile)) + { + errorString = "Couldn't create project from clipboard contents."; mainWindowList.closeWindow (mainWindowList.windows.getLast()); } + + if (errorString.isNotEmpty()) + { + AlertWindow::showMessageBoxAsync (AlertWindow::WarningIcon, "Error", errorString); + tempFile.deleteFile(); + } } void ProjucerApplication::createNewPIP()