Fixed NullPointerException when trying to set a special field or mark…

… an entry through the menu without having an open database
JabRef · Aug 10, 2016 · d1721de · d1721de
1 parent 6b3b8fc
commit d1721de
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - Fixed [#16682](https://github.com/JabRef/jabref/issues/1682): An entry now must have a BibTeX key to be cited in OpenOffice/LibreOffice
 - Fixed NullPointerException when clicking OK without specifying a field name in set/clear/rename fields
 - Fixed IndexOutOfBoundsException when trying to download a full text document without selecting an entry
+- Fixed NullPointerException when trying to set a special field or mark an entry through the menu without having an open database
 
 
 ### Removed

diff --git a/src/main/java/net/sf/jabref/gui/worker/MarkEntriesAction.java b/src/main/java/net/sf/jabref/gui/worker/MarkEntriesAction.java
@@ -75,18 +75,20 @@ public void actionPerformed(ActionEvent actionEvent) {
     @Override
     public void run() {
         BasePanel panel = frame.getCurrentBasePanel();
-        List<BibEntry> bes = panel.getSelectedEntries();
-
-        // used at update() to determine output string
-        besLength = bes.size();
-
-        if (!bes.isEmpty()) {
-            NamedCompound ce = new NamedCompound(Localization.lang("Mark entries"));
-            for (BibEntry be : bes) {
-                EntryMarker.markEntry(be, level + 1, false, ce);
+        if (panel != null) {
+            List<BibEntry> bes = panel.getSelectedEntries();
+
+            // used at update() to determine output string
+            besLength = bes.size();
+
+            if (!bes.isEmpty()) {
+                NamedCompound ce = new NamedCompound(Localization.lang("Mark entries"));
+                for (BibEntry be : bes) {
+                    EntryMarker.markEntry(be, level + 1, false, ce);
+                }
+                ce.end();
+                panel.getUndoManager().addEdit(ce);
             }
-            ce.end();
-            panel.getUndoManager().addEdit(ce);
         }
     }
 

diff --git a/src/main/java/net/sf/jabref/specialfields/SpecialFieldMenuAction.java b/src/main/java/net/sf/jabref/specialfields/SpecialFieldMenuAction.java
@@ -35,6 +35,8 @@ public SpecialFieldMenuAction(SpecialFieldValue val, JabRefFrame frame) {
 
     @Override
     public void actionPerformed(ActionEvent evt) {
-        frame.getCurrentBasePanel().runCommand(actionName);
+        if (frame.getCurrentBasePanel() != null) {
+            frame.getCurrentBasePanel().runCommand(actionName);
+        }
     }
 }