kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Move JSON settings start before platform start

Browse source
This commit is contained in:
Eric Kotato 2020-12-25 20:02:19 +03:00
parent 4e83d8b315
commit 3acdd673dc
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Telegram/SourceFiles/core/application.cpp
View file

@ -20,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/sandbox.h" #include "core/sandbox.h"
#include "core/local_url_handlers.h" #include "core/local_url_handlers.h"
#include "core/launcher.h" #include "core/launcher.h"
#include "kotato/json_settings.h"
#include "core/ui_integration.h" #include "core/ui_integration.h"
#include "core/core_settings.h" #include "core/core_settings.h"
#include "chat_helpers/emoji_keywords.h" #include "chat_helpers/emoji_keywords.h"
@ -198,12 +197,10 @@ Application::~Application() {
Global::finish(); Global::finish();
ThirdParty::finish(); ThirdParty::finish();
Kotato::JsonSettings::Finish();
Instance = nullptr; Instance = nullptr;
} }
void Application::run() { void Application::run() {
Kotato::JsonSettings::Start();
style::internal::StartFonts(); style::internal::StartFonts();
ThirdParty::start(); ThirdParty::start();

3
Telegram/SourceFiles/core/launcher.cpp
View file

@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/update_checker.h" #include "core/update_checker.h"
#include "core/sandbox.h" #include "core/sandbox.h"
#include "base/concurrent_timer.h" #include "base/concurrent_timer.h"
#include "kotato/json_settings.h"
namespace Core { namespace Core {
namespace { namespace {
@ -330,6 +331,7 @@ int Launcher::exec() {
// Must be started before Platform is started. // Must be started before Platform is started.
Logs::start(this); Logs::start(this);
Kotato::JsonSettings::Start();
// Must be started before Sandbox is created. // Must be started before Sandbox is created.
Platform::start(); Platform::start();
@ -359,6 +361,7 @@ int Launcher::exec() {
CrashReports::Finish(); CrashReports::Finish();
Platform::finish(); Platform::finish();
Kotato::JsonSettings::Finish();
Logs::finish(); Logs::finish();
return result; return result;