Merge pull request #4263 from petrhejna/fix-open-when-already-openned…

…-tab Opening a take/create offers closes previously openned tab
bisq-network · May 25, 2020 · 4a5d828 · 4a5d828
2 parents 481ae23 + 4c8e89e
commit 4a5d828
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/OfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
@@ -179,23 +179,21 @@ private void loadView(Class<? extends View> viewClass) {
             OfferActionHandler offerActionHandler = new OfferActionHandler() {
                 @Override
                 public void onCreateOffer(TradeCurrency tradeCurrency) {
-                    if (!createOfferViewOpen) {
-                        if (canCreateOrTakeOffer()) {
-                            openCreateOffer(tradeCurrency);
-                        }
-                    } else {
-                        log.error("You have already a \"Create offer\" tab open.");
+                    if (createOfferViewOpen) {
+                        tabPane.getTabs().remove(createOfferTab);
+                    }
+                    if (canCreateOrTakeOffer()) {
+                        openCreateOffer(tradeCurrency);
                     }
                 }
 
                 @Override
                 public void onTakeOffer(Offer offer) {
-                    if (!takeOfferViewOpen) {
-                        if (canCreateOrTakeOffer()) {
-                            openTakeOffer(offer);
-                        }
-                    } else {
-                        log.error("You have already a \"Take offer\" tab open.");
+                    if (takeOfferViewOpen) {
+                        tabPane.getTabs().remove(takeOfferTab);
+                    }
+                    if (canCreateOrTakeOffer()) {
+                        openTakeOffer(offer);
                     }
                 }
             };