1 files changed, 18 insertions, 2 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h
index 0b07717..c284133 100644
--- a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h
+++ b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h
@@ -10,6 +10,7 @@
 
 class DbManager;
 class Config;
+class CollationManager;
 class QProcessEnvironment;
 class PluginManager;
 class QThreadPool;
@@ -29,6 +30,8 @@ class UpdateManager;
 #endif
 class ExtraLicenseManager;
 class SqliteExtensionManager;
+class Db;
+class CodeSnippetManager;
 
 /** @file */
 
@@ -60,6 +63,8 @@ class API_EXPORT SQLiteStudio : public QObject
         DECLARE_SINGLETON(SQLiteStudio)
 
     public:
+        typedef std::function<void()> CrashHandler;
+
         /**
          * @brief Initializes SQLiteStudio object.
          * @param cmdListArguments Command line arguments.
@@ -123,6 +128,9 @@ class API_EXPORT SQLiteStudio : public QObject
         ExportManager* getExportManager() const;
         void setExportManager(ExportManager* value);
 
+        CodeSnippetManager* getCodeSnippetManager() const;
+        void setCodeSnippetManager(CodeSnippetManager* newCodeSnippetManager);
+
         int getVersion() const;
         QString getVersionString() const;
 
@@ -159,6 +167,8 @@ class API_EXPORT SQLiteStudio : public QObject
         QStringList getInitialTranslationFiles() const;
         void setInitialTranslationFiles(const QStringList& value);
 
+        void installCrashHandler(CrashHandler handler);
+
     private:
         /**
          * @brief Creates singleton instance.
@@ -175,6 +185,10 @@ class API_EXPORT SQLiteStudio : public QObject
          */
         ~SQLiteStudio();
 
+        void setupCrashHandler();
+
+        QList<CrashHandler> crashHandlers;
+
         /**
          * @brief Code formatter service.
          */
@@ -207,26 +221,28 @@ class API_EXPORT SQLiteStudio : public QObject
         ExportManager* exportManager = nullptr;
         ImportManager* importManager = nullptr;
         PopulateManager* populateManager = nullptr;
+        CodeSnippetManager* codeSnippetManager = nullptr;
 #ifdef PORTABLE_CONFIG
         UpdateManager* updateManager = nullptr;
 #endif
         ExtraLicenseManager* extraLicenseManager = nullptr;
         QString currentLang;
         QStringList initialTranslationFiles;
+        bool finalCleanupDone = false;
 
     private slots:
         void pluginLoaded(Plugin* plugin,PluginType* pluginType);
         void pluginToBeUnloaded(Plugin* plugin,PluginType* pluginType);
         void pluginUnloaded(const QString& pluginName,PluginType* pluginType);
 
+    public slots:
         /**
          * @brief Cleans up all internal objects.
          *
-         * Deletes all internal objects. It's called from destructor.
+         * Deletes all internal objects. It's called from qApp signal or from UI window closing event.
          */
         void cleanUp();
 
-    public slots:
         /**
          * @brief Updates code formatter with available plugins.
          *