2 files changed, 9 insertions, 0 deletions
diff --git a/lib/accountregistry.cpp b/lib/accountregistry.cpp
index b40d5ecf..ab8c46e3 100644
--- a/lib/accountregistry.cpp
+++ b/lib/accountregistry.cpp
@@ -125,3 +125,10 @@ QStringList AccountRegistry::accountsLoading() const
 {
     return m_accountsLoading;
 }
+
+AccountRegistry::~AccountRegistry()
+{
+    for (const auto& connection : *this) {
+        connection->saveState();
+    }
+}
diff --git a/lib/accountregistry.h b/lib/accountregistry.h
index 38cfe6c6..959c7d42 100644
--- a/lib/accountregistry.h
+++ b/lib/accountregistry.h
@@ -42,6 +42,8 @@ public:
     [[deprecated("Use Accounts variable instead")]] //
     static AccountRegistry& instance();
 
+    ~AccountRegistry();
+
     // Expose most of QVector's const-API but only provide add() and drop()
     // for changing it. In theory other changing operations could be supported
     // too; but then boilerplate begin/end*() calls has to be tucked into each