From d579d88364f3db4962acf90acc59872825e7c64b Mon Sep 17 00:00:00 2001
From: Imanol Fernandez <mortimergoro@gmail.com>
Date: Thu, 6 Feb 2020 20:09:56 +0100
Subject: [PATCH] Check if the collapse action is available before calling
 collapseEnd (#2752)

---
 .../org/mozilla/vrbrowser/ui/widgets/WindowWidget.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
index c9dcd82bd..9d77b257a 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -1801,9 +1801,9 @@ public void onAction(String action) {
             @Override
             public void onDismiss() {
                 if (aSelection.isActionAvailable(GeckoSession.SelectionActionDelegate.ACTION_UNSELECT)) {
-                    aSelection.execute(GeckoSession.SelectionActionDelegate.ACTION_UNSELECT);
-                } else {
-                    aSelection.collapseToEnd();
+                    aSelection.unselect();
+                } else if (aSelection.isActionAvailable(GeckoSession.SelectionActionDelegate.ACTION_COLLAPSE_TO_END)) {
+                    aSelection.collapseToEnd() ;
                 }
 
                 aSelection.hide();