From 8b470d9e7e2f9103da76b388613dbe15246c38e8 Mon Sep 17 00:00:00 2001
From: Thog
Date: Tue, 30 Aug 2016 14:34:42 +0200
Subject: Fix #14

---
 src/main/java/cuchaz/enigma/gui/Gui.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/main/java/cuchaz/enigma')

diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 29d5fec..46d3b5c 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -774,10 +774,11 @@ public class Gui {
 
     public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName)
     {
-        ClassEntry oldEntry = deobfReference.entry.getClassEntry();
-        ClassEntry newEntry = new ClassEntry(Descriptor.toJvmName(newName));
-        moveClassTree(deobfReference, newName, oldEntry.getPackageName().equals(Constants.NONE_PACKAGE),
-                newEntry.getClassEntry().getPackageName().equals(Constants.NONE_PACKAGE));
+        String oldEntry = deobfReference.entry.getClassEntry().getPackageName();
+        String newEntry = new ClassEntry(Descriptor.toJvmName(newName)).getPackageName();
+        if (oldEntry != null && newEntry != null)
+            moveClassTree(deobfReference, newName, oldEntry.equals(Constants.NONE_PACKAGE),
+                    newEntry.equals(Constants.NONE_PACKAGE));
     }
 
     public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName, boolean isOldOb, boolean isNewOb)
-- 
cgit v1.2.3