From 5603a8b8d1b2eeb85ca429007af38732404cd24a Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <mail@smessmer.de>
Date: Mon, 26 Oct 2015 20:14:41 +0100
Subject: [PATCH] Fix config loading

---
 src/config/crypto/ConcreteCryConfigEncryptor.h | 1 +
 src/config/crypto/CryConfigEncryptorFactory.h  | 1 +
 src/main.cpp                                   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/config/crypto/ConcreteCryConfigEncryptor.h b/src/config/crypto/ConcreteCryConfigEncryptor.h
index 6df2e216..f5702b25 100644
--- a/src/config/crypto/ConcreteCryConfigEncryptor.h
+++ b/src/config/crypto/ConcreteCryConfigEncryptor.h
@@ -8,6 +8,7 @@
 #include "CryConfigEncryptor.h"
 
 namespace cryfs {
+    //TODO Test
     template<class Cipher>
     class ConcreteCryConfigEncryptor: public CryConfigEncryptor {
     public:
diff --git a/src/config/crypto/CryConfigEncryptorFactory.h b/src/config/crypto/CryConfigEncryptorFactory.h
index 82c63b5e..65f8f688 100644
--- a/src/config/crypto/CryConfigEncryptorFactory.h
+++ b/src/config/crypto/CryConfigEncryptorFactory.h
@@ -7,6 +7,7 @@
 #include "kdf/Scrypt.h"
 
 namespace cryfs {
+    //TODO Test
     class CryConfigEncryptorFactory {
     public:
         template<class Cipher>
diff --git a/src/main.cpp b/src/main.cpp
index 667e896c..2340abb0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -96,6 +96,7 @@ CryConfigFile loadOrCreateConfig(const ProgramOptions &options) {
             std::cerr << "Could not load config file. Did you enter the correct password?" << std::endl;
             exit(1);
         }
+        return *config;
     } catch (const std::exception &e) {
         std::cerr << "Error: " << e.what() << std::endl;
         exit(1);