1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Storages/FileStorages.cpp b/Swift/Controllers/Storages/FileStorages.cpp
index 52a5e00..e1b681f 100644
--- a/Swift/Controllers/Storages/FileStorages.cpp
+++ b/Swift/Controllers/Storages/FileStorages.cpp
@@ -1,62 +1,62 @@
 /*
  * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "Swift/Controllers/Storages/FileStorages.h"
 #include "Swift/Controllers/Storages/VCardFileStorage.h"
 #include "Swift/Controllers/Storages/AvatarFileStorage.h"
 #include "Swift/Controllers/Storages/CapsFileStorage.h"
 #include "Swift/Controllers/Storages/RosterFileStorage.h"
 #include <Swiften/History/SQLiteHistoryStorage.h>
 #include <Swiften/Base/Path.h>
 
 namespace Swift {
 
 FileStorages::FileStorages(const boost::filesystem::path& baseDir, const JID& jid, CryptoProvider* crypto) {
 	boost::filesystem::path profile = stringToPath(jid.toBare());
 	vcardStorage = new VCardFileStorage(baseDir / profile / "vcards", crypto);
 	capsStorage = new CapsFileStorage(baseDir / "caps");
 	avatarStorage = new AvatarFileStorage(baseDir / "avatars", baseDir / profile / "avatars", crypto);
 	rosterStorage = new RosterFileStorage(baseDir / profile / "roster.xml");
 #ifdef SWIFT_EXPERIMENTAL_HISTORY
 	historyStorage = new SQLiteHistoryStorage(baseDir / "history.db");
+#else
+	historyStorage = NULL;
 #endif
 }
 
 FileStorages::~FileStorages() {
 	delete rosterStorage;
 	delete avatarStorage;
 	delete capsStorage;
 	delete vcardStorage;
-#ifdef SWIFT_EXPERIMENTAL_HISTORY
 	delete historyStorage;
-#endif
 }
 
 VCardStorage* FileStorages::getVCardStorage() const {
 	return vcardStorage;
 }
 
 CapsStorage* FileStorages::getCapsStorage() const {
 	return capsStorage;
 }
 
 AvatarStorage* FileStorages::getAvatarStorage() const {
 	return avatarStorage;
 }
 
 RosterStorage* FileStorages::getRosterStorage() const {
 	return rosterStorage;
 }
 
 HistoryStorage* FileStorages::getHistoryStorage() const {
 #ifdef SWIFT_EXPERIMENTAL_HISTORY
 	return historyStorage;
 #else
 	return NULL;
 #endif
 }
 
 }