From bbc635e500ce93eb438037e892e290e5f82fdb83 Mon Sep 17 00:00:00 2001
From: Gres <gres@gres.biz>
Date: Fri, 22 May 2020 21:35:55 +0300
Subject: [PATCH] Change models initialization order

---
 src/manager.cpp | 4 ++--
 src/manager.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/manager.cpp b/src/manager.cpp
index eb4b879..1cd0450 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -31,10 +31,10 @@ const auto resultHideWaitUs = 300'000;
 using Loader = update::Loader;
 
 Manager::Manager()
-  : settings_(std::make_unique<Settings>())
+  : models_(std::make_unique<CommonModels>())
+  , settings_(std::make_unique<Settings>())
   , updater_(std::make_unique<Loader>(Loader::Urls{{updatesUrl}}))
   , updateAutoChecker_(std::make_unique<update::AutoChecker>(*updater_))
-  , models_(std::make_unique<CommonModels>())
 {
   SOFT_ASSERT(settings_, return );
 
diff --git a/src/manager.h b/src/manager.h
index 3d4ae3a..340c7d3 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -35,6 +35,7 @@ private:
   void finishTask(const TaskPtr &task);
   void warnIfOutdated();
 
+  std::unique_ptr<CommonModels> models_;
   std::unique_ptr<Settings> settings_;
   std::unique_ptr<TrayIcon> tray_;
   std::unique_ptr<Capturer> capturer_;
@@ -44,6 +45,5 @@ private:
   std::unique_ptr<Representer> representer_;
   std::unique_ptr<update::Loader> updater_;
   std::unique_ptr<update::AutoChecker> updateAutoChecker_;
-  std::unique_ptr<CommonModels> models_;
   int activeTaskCount_{0};
 };