From 5472a5f455cfd6ff9ce956fa51be206789e608db Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 18 Sep 2015 15:05:18 +0200
Subject: [PATCH] Also catch exceptions on encryptAll and reset trashbin and
 singleUser mode

---
 core/command/encryption/encryptall.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 2269663b21..4ae6ae4783 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -115,8 +115,13 @@ class EncryptAll extends Command {
 		if ($this->questionHelper->ask($input, $output, $question)) {
 			$this->forceSingleUserAndTrashbin();
 
-			$defaultModule = $this->encryptionManager->getEncryptionModule();
-			$defaultModule->encryptAll($input, $output);
+			try {
+				$defaultModule = $this->encryptionManager->getEncryptionModule();
+				$defaultModule->encryptAll($input, $output);
+			} catch (\Exception $ex) {
+				$this->resetSingleUserAndTrashbin();
+				throw $ex;
+			}
 
 			$this->resetSingleUserAndTrashbin();
 		} else {