From 86b4ce6243214f3f776147ca44e4b5789c6c8aef Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 7 Jun 2017 16:47:24 +0200
Subject: [PATCH] Fixes #510

---
 .../java/org/cryptomator/ui/controls/DirectoryListCell.java    | 3 +--
 main/ui/src/main/java/org/cryptomator/ui/model/Vault.java      | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/DirectoryListCell.java b/main/ui/src/main/java/org/cryptomator/ui/controls/DirectoryListCell.java
index 81b0d1252..27f9f56da 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/DirectoryListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/DirectoryListCell.java
@@ -31,12 +31,11 @@ public class DirectoryListCell extends DraggableListCell<Vault> {
 	private final Label pathText = new Label();
 	private final VBox vbox = new VBox(4.0, nameText, pathText);
 	private final HBox hbox = new HBox(6.0, statusText, vbox);
-	private final ObjectExpression<Vault.State> vaultState;
 
 	private ContextMenu vaultContextMenu;
 
 	public DirectoryListCell() {
-		vaultState = ObjectExpression.objectExpression(EasyBind.select(itemProperty()).selectObject(Vault::stateProperty));
+		ObjectExpression<Vault.State> vaultState = ObjectExpression.objectExpression(EasyBind.select(itemProperty()).selectObject(Vault::stateProperty));
 
 		hbox.setAlignment(Pos.CENTER_LEFT);
 		hbox.setPrefWidth(1);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
index 311d49a9e..bb1c87227 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
@@ -167,6 +167,7 @@ public class Vault {
 		});
 		if (mount != null) {
 			unmountOperationChooser.apply(mount).unmount();
+			mount = null;
 		}
 		Platform.runLater(() -> {
 			state.set(State.UNLOCKED);