1 files changed, 4 insertions, 1 deletions
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/UIThread.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/UIThread.java
index f1965b2..4dd990b 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/UIThread.java
+++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/UIThread.java
@@ -88,7 +88,7 @@ public class UIThread {
         TreeViewOverview treeViewOverview = new TreeViewOverview(shell3);
         shell3.open();
         // ComponentRegistry.getDirector().loadViewTreeData(null);
-        while (!shell.isDisposed() && !shell2.isDisposed()) {
+        while (!shell.isDisposed() && !shell2.isDisposed() && !shell3.isDisposed()) {
             if (!display.readAndDispatch()) {
                 display.sleep();
             }
@@ -99,6 +99,9 @@ public class UIThread {
         if (!shell2.isDisposed()) {
             shell2.dispose();
         }
+        if (!shell3.isDisposed()) {
+            shell3.dispose();
+        }
 
         // NO LONGER TESTING STUFF.