Fix removing Menu causes exception, close #292

kotcrab · Jul 28, 2018 · d24b0ce · d24b0ce
1 parent 1c87f94
commit d24b0ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ui/CHANGES.md b/ui/CHANGES.md
@@ -1,5 +1,6 @@
 #### Version: 1.4.1 (LibGDX 1.9.8)
 - **Fixed**: `FileChooser`'s icon provider not working correctly when chooser's selection checkboxes were enabled 
+- **Fixed**: [#292](https://github.com/kotcrab/vis-editor/issues/292) removing `Menu` from `MenuBar` causes `IllegalStateException`
 
 #### Version: 1.4.0 (LibGDX 1.9.6)
 - **Added**: [#259](https://github.com/kotcrab/vis-editor/issues/259) `VisImageTextButton#setGenerateDisabledImage(boolean)` along with getter, added `VisImageButton#isGenerateDisabledImage`

diff --git a/ui/src/main/java/com/kotcrab/vis/ui/widget/Menu.java b/ui/src/main/java/com/kotcrab/vis/ui/widget/Menu.java
@@ -97,7 +97,7 @@ public boolean remove () {
 
 	/** Called by MenuBar when this menu is added to it */
 	void setMenuBar (MenuBar menuBar) {
-		if (this.menuBar != null) throw new IllegalStateException("Menu was already added to MenuBar");
+		if (this.menuBar != null && menuBar != null) throw new IllegalStateException("Menu was already added to MenuBar");
 		this.menuBar = menuBar;
 	}