Fix for regression with on-top toolbar due to incorrect commandBehavi…

…or definition mentioned here https://stackoverflow.com/questions/47141271/codename1-nullpointerexception-after-update
codenameone · Nov 13, 2017 · 2229890 · 2229890
1 parent a60ebeb
commit 2229890
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CodenameOne/src/com/codename1/ui/SideMenuBar.java b/CodenameOne/src/com/codename1/ui/SideMenuBar.java
@@ -153,7 +153,7 @@ public static void closeCurrentMenu() {
      * @param callback will be invoked when the menu is actually closed
      */
     public static void closeCurrentMenu(final Runnable callback) {
-        if(Toolbar.isOnTopSideMenu() && Display.getInstance().getCommandBehavior() != Display.COMMAND_BEHAVIOR_SIDE_NAVIGATION) {
+        if(Toolbar.isOnTopSideMenu() && (Toolbar.isGlobalToolbar() || Display.getInstance().getCommandBehavior() != Display.COMMAND_BEHAVIOR_SIDE_NAVIGATION)) {
             Display.getInstance().getCurrent().getToolbar().closeSideMenu();
             callback.run();
             return;
@@ -1774,7 +1774,7 @@ public void actionPerformed(ActionEvent evt) {
         }
 
         public void actionPerformed(final ActionEvent evt) {
-            if(Toolbar.isOnTopSideMenu() && Display.getInstance().getCommandBehavior() != Display.COMMAND_BEHAVIOR_SIDE_NAVIGATION) {
+            if(Toolbar.isOnTopSideMenu() && (Toolbar.isGlobalToolbar() || Display.getInstance().getCommandBehavior() != Display.COMMAND_BEHAVIOR_SIDE_NAVIGATION)) {
                 Display.getInstance().getCurrent().getToolbar().closeSideMenu();
                 cmd.actionPerformed(evt);
                 return;