mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-22 04:05:39 +00:00
GP-5069 PR #7086 update some fsb icons, fix NPE
This commit is contained in:
parent
39ca415df1
commit
44db4c9d92
@ -864,9 +864,12 @@ src/main/resources/images/openFolderInView.png||Modified Nuvola Icons - LGPL 2.1
|
||||
src/main/resources/images/openFolderLabels.png||Modified Nuvola Icons - LGPL 2.1||||END|
|
||||
src/main/resources/images/openFolderNamespaces.dark.png||GHIDRA||||END|
|
||||
src/main/resources/images/openFolderNamespaces.png||Modified Nuvola Icons - LGPL 2.1||||END|
|
||||
src/main/resources/images/oxygen/16x16/application-javascript.png||Oxygen Icons - LGPL 3.0||||END|
|
||||
src/main/resources/images/oxygen/16x16/application-pdf.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
|
||||
src/main/resources/images/oxygen/16x16/application-x-bzip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
|
||||
src/main/resources/images/oxygen/16x16/application-x-desktop.png||Oxygen Icons - LGPL 3.0||||END|
|
||||
src/main/resources/images/oxygen/16x16/application-x-java-archive.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
|
||||
src/main/resources/images/oxygen/16x16/application-x-shellscript.png||Oxygen Icons - LGPL 3.0||||END|
|
||||
src/main/resources/images/oxygen/16x16/application-x-subrip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
|
||||
src/main/resources/images/oxygen/16x16/bookmarks.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
|
||||
src/main/resources/images/oxygen/16x16/games-config-background.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
|
||||
@ -878,6 +881,7 @@ src/main/resources/images/oxygen/16x16/text-x-c++src.png||Oxygen Icons - LGPL 3.
|
||||
src/main/resources/images/oxygen/16x16/text-x-chdr.png||Oxygen Icons - LGPL 3.0||||END|
|
||||
src/main/resources/images/oxygen/16x16/text-x-csharp.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
|
||||
src/main/resources/images/oxygen/16x16/text-x-pascal.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
|
||||
src/main/resources/images/oxygen/16x16/text-x-python.png||Oxygen Icons - LGPL 3.0||||END|
|
||||
src/main/resources/images/package.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END|
|
||||
src/main/resources/images/package_development.png||Nuvola Icons - LGPL 2.1|||nuvola|END|
|
||||
src/main/resources/images/package_green.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END|
|
||||
|
@ -4,9 +4,9 @@
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@ -192,16 +192,18 @@ public class FSBRootNode extends FSBNode {
|
||||
}
|
||||
|
||||
public FSRL getProgramProviderFSRL(FSRL fsrl) {
|
||||
GFileSystem fs = fsRef.getFilesystem();
|
||||
if (fs instanceof GFileSystemProgramProvider programProviderFS) {
|
||||
try {
|
||||
GFile gfile = fs.lookup(fsrl.getPath());
|
||||
if (gfile != null && programProviderFS.canProvideProgram(gfile)) {
|
||||
return fsrl;
|
||||
if (fsRef != null) {
|
||||
GFileSystem fs = fsRef.getFilesystem();
|
||||
if (fs instanceof GFileSystemProgramProvider programProviderFS) {
|
||||
try {
|
||||
GFile gfile = fs.lookup(fsrl.getPath());
|
||||
if (gfile != null && programProviderFS.canProvideProgram(gfile)) {
|
||||
return fsrl;
|
||||
}
|
||||
}
|
||||
catch (IOException e) {
|
||||
// ignore error and fall thru
|
||||
}
|
||||
}
|
||||
catch (IOException e) {
|
||||
// ignore error and fall thru
|
||||
}
|
||||
}
|
||||
return null;
|
||||
|
Binary file not shown.
After Width: | Height: | Size: 634 B |
Binary file not shown.
After Width: | Height: | Size: 498 B |
Binary file not shown.
After Width: | Height: | Size: 527 B |
Binary file not shown.
After Width: | Height: | Size: 661 B |
Loading…
Reference in New Issue
Block a user