From: Niki Roo <niki@nikiroo.be>
Date: Thu, 2 Jan 2020 17:20:56 +0000 (+0100)
Subject: Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=505be508ae7d3fb48122be548b310a238cfb91eb;hp=a8659744eae329c075e699cf484f90a4f7c3cdc5

Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'
---

diff --git a/src/jexer/TWidget.java b/src/jexer/TWidget.java
index d60efd8..ce22330 100644
--- a/src/jexer/TWidget.java
+++ b/src/jexer/TWidget.java
@@ -1415,6 +1415,7 @@ public abstract class TWidget implements Comparable<TWidget> {
      * @return TRUE if the child was removed, FALSE if it was not found
      */
     public boolean removeChild(final TWidget child) {
+<<<<<<< HEAD:TWidget.java
         if (children.remove(child)) {
                 child.close();
                 child.parent = null;
@@ -1426,6 +1427,19 @@ public abstract class TWidget implements Comparable<TWidget> {
         }
         
         return false;
+=======
+    	if (children.remove(child)) {
+    		child.close();
+    		child.parent = null;
+    		child.window = null;
+    		
+    		resetTabOrder();
+    		
+    		return true;
+    	}
+    	
+    	return false;
+>>>>>>> upstream-sep2019-tcombo:src/jexer/TWidget.java
     }
 
     /**