aji/ScreenTranslator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change models initialization order

Browse Source
This commit is contained in:
Gres 2020-05-22 21:35:55 +03:00
parent 644278890b
commit bbc635e500
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/manager.cpp
View File

@ -31,10 +31,10 @@ const auto resultHideWaitUs = 300'000;
using Loader = update::Loader; using Loader = update::Loader;
Manager::Manager() 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}})) , updater_(std::make_unique<Loader>(Loader::Urls{{updatesUrl}}))
, updateAutoChecker_(std::make_unique<update::AutoChecker>(*updater_)) , updateAutoChecker_(std::make_unique<update::AutoChecker>(*updater_))
, models_(std::make_unique<CommonModels>())
{ {
SOFT_ASSERT(settings_, return ); SOFT_ASSERT(settings_, return );

2
src/manager.h
View File

@ -35,6 +35,7 @@ private:
void finishTask(const TaskPtr &task); void finishTask(const TaskPtr &task);
void warnIfOutdated(); void warnIfOutdated();
std::unique_ptr<CommonModels> models_;
std::unique_ptr<Settings> settings_; std::unique_ptr<Settings> settings_;
std::unique_ptr<TrayIcon> tray_; std::unique_ptr<TrayIcon> tray_;
std::unique_ptr<Capturer> capturer_; std::unique_ptr<Capturer> capturer_;
@ -44,6 +45,5 @@ private:
std::unique_ptr<Representer> representer_; std::unique_ptr<Representer> representer_;
std::unique_ptr<update::Loader> updater_; std::unique_ptr<update::Loader> updater_;
std::unique_ptr<update::AutoChecker> updateAutoChecker_; std::unique_ptr<update::AutoChecker> updateAutoChecker_;
std::unique_ptr<CommonModels> models_;
int activeTaskCount_{0}; int activeTaskCount_{0};
}; };