yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

GT-2886 - fixed NPE when trying to beep

Browse source
This commit is contained in:
dragonmacher 2019-05-22 14:38:33 -04:00
parent 146a83f953
commit 2f58ec7b47
8 changed files with 53 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerClipboardProvider.java
View file

@ -86,8 +86,7 @@ public class ByteViewerClipboardProvider extends ByteCopier
@Override
public boolean paste(Transferable pasteData) {
if (!supportsPasteTransferable(pasteData)) {
tool.setStatusInfo("Paste failed: No valid data on clipboard");
tool.getToolFrame().getToolkit().beep();
tool.setStatusInfo("Paste failed: No valid data on clipboard", true);
return false;
}
@ -96,8 +95,7 @@ public class ByteViewerClipboardProvider extends ByteCopier
return pasteBytes(pasteData);
}
catch (Exception e) {
tool.setStatusInfo("Paste failed: " + e.getMessage());
tool.getToolFrame().getToolkit().beep();
tool.setStatusInfo("Paste failed: " + e.getMessage(), true);
}
return false;
}