From 71d378655e098a701b18dfc75bfc021f86176e3e Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Mon, 30 Sep 2024 06:30:45 -0400 Subject: [PATCH] GP-4919: Improving Load Libraries results dialog for programs with no libraries --- .../plugin/importer/LoadLibrariesOptionsDialog.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/LoadLibrariesOptionsDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/LoadLibrariesOptionsDialog.java index a1ea2741c9..6a5d43fe53 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/LoadLibrariesOptionsDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/LoadLibrariesOptionsDialog.java @@ -80,11 +80,16 @@ public class LoadLibrariesOptionsDialog extends OptionsDialog { // Display results String importMessages = messageLog.toString(); - if (!Loader.loggingDisabled && !importMessages.isEmpty()) { - Msg.info(ImporterUtilities.class, TITLE + ":\n" + importMessages); + if (!importMessages.isEmpty()) { + if (!Loader.loggingDisabled) { + Msg.info(ImporterUtilities.class, TITLE + ":\n" + importMessages); + } + MultiLineMessageDialog.showModalMessageDialog(null, TITLE, "Results", + importMessages, MultiLineMessageDialog.INFORMATION_MESSAGE); + } + else { + Msg.showInfo(this, null, TITLE, "The program has no libraries."); } - MultiLineMessageDialog.showModalMessageDialog(null, TITLE, "Results", - importMessages, MultiLineMessageDialog.INFORMATION_MESSAGE); loadResults.release(consumer); }