storage/State: make mount errors non-fatal

Fixes crash bug caused by commit 64d141f7

storage/State: make mount errors non-fatal
08db2846 · Max Kellermann · a20b3268 · 08db2846
Commit 08db2846 authored Jan 02, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

StorageState.cxx src/storage/StorageState.cxx +4 -1

No files found.
--- a/src/storage/StorageState.cxx
+++ b/src/storage/StorageState.cxx
@@ -105,7 +105,10 @@ storage_state_restore(const char *line, TextFile &file, Instance &instance)
 			((SimpleDatabase *)db)->Mount(uri.c_str(), url.c_str());
 		} catch (...) {
 			delete storage;
-			throw;
+			FormatError(std::current_exception(),
+				    "Failed to restore mount to %s",
+				    url.c_str());
+			return true;
 		}
 	}