Merge branch 'master' into debian

2 files changed, 36 insertions, 1 deletions

diff --git a/src/utils/optional_bool.hpp b/src/utils/optional_bool.hpp
new file mode 100644
index 0000000..59bbbab
--- /dev/null
+++ b/src/utils/optional_bool.hpp
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <string>
+
+struct OptionalBool
+{
+  OptionalBool() = default;
+
+  OptionalBool(bool value):
+  is_set(true), value(value) {}
+
+  void set_value(bool value)
+  {
+    this->is_set = true;
+    this->value = value;
+  }
+
+  void unset()
+  {
+    this->is_set = false;
+  }
+
+  std::string to_string()
+  {
+    if (this->is_set == false)
+      return "unset";
+    else if (this->value)
+      return "true";
+    else
+      return "false";
+  }
+
+  bool is_set{false};
+  bool value{false};
+};
diff --git a/src/utils/reload.cpp b/src/utils/reload.cpp
index 348c5b5..fdca9bc 100644
--- a/src/utils/reload.cpp
+++ b/src/utils/reload.cpp
@@ -26,7 +26,7 @@ void reload_process()
 #ifdef USE_DATABASE
   try {
       open_database();
-    } catch (const litesql::DatabaseError&) {
+    } catch (...) {
       log_warning("Re-using the previous database.");
     }
 #endif