void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash in SystemMediaControls init.

Browse source
This commit is contained in:
John Preston 2023-01-19 09:53:59 +04:00
parent df5baba86b
commit 0f234188e1
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -148,9 +148,6 @@ Application::Application(not_null<Launcher*> launcher)
, _audio(std::make_unique<Media::Audio::Instance>()) , _audio(std::make_unique<Media::Audio::Instance>())
, _fallbackProductionConfig( , _fallbackProductionConfig(
std::make_unique<MTP::Config>(MTP::Environment::Production)) std::make_unique<MTP::Config>(MTP::Environment::Production))
, _mediaControlsManager(MediaControlsManager::Supported()
? std::make_unique<MediaControlsManager>()
: nullptr)
, _downloadManager(std::make_unique<Data::DownloadManager>()) , _downloadManager(std::make_unique<Data::DownloadManager>())
, _domain(std::make_unique<Main::Domain>(cDataFile())) , _domain(std::make_unique<Main::Domain>(cDataFile()))
, _exportManager(std::make_unique<Export::Manager>()) , _exportManager(std::make_unique<Export::Manager>())
@ -216,6 +213,8 @@ Application::~Application() {
Window::Theme::Uninitialize(); Window::Theme::Uninitialize();
_mediaControlsManager = nullptr;
Media::Player::finish(_audio.get()); Media::Player::finish(_audio.get());
style::stopManager(); style::stopManager();
@ -267,6 +266,10 @@ void Application::run() {
startSystemDarkModeViewer(); startSystemDarkModeViewer();
Media::Player::start(_audio.get()); Media::Player::start(_audio.get());
if (MediaControlsManager::Supported()) {
_mediaControlsManager = std::make_unique<MediaControlsManager>();
}
style::ShortAnimationPlaying( style::ShortAnimationPlaying(
) | rpl::start_with_next([=](bool playing) { ) | rpl::start_with_next([=](bool playing) {
if (playing) { if (playing) {

2
Telegram/SourceFiles/core/application.h
View file

@ -387,7 +387,7 @@ private:
std::unique_ptr<Window::Notifications::System> _notifications; std::unique_ptr<Window::Notifications::System> _notifications;
using MediaControlsManager = Media::SystemMediaControlsManager; using MediaControlsManager = Media::SystemMediaControlsManager;
const std::unique_ptr<MediaControlsManager> _mediaControlsManager; std::unique_ptr<MediaControlsManager> _mediaControlsManager;
const std::unique_ptr<Data::DownloadManager> _downloadManager; const std::unique_ptr<Data::DownloadManager> _downloadManager;
const std::unique_ptr<Main::Domain> _domain; const std::unique_ptr<Main::Domain> _domain;
const std::unique_ptr<Export::Manager> _exportManager; const std::unique_ptr<Export::Manager> _exportManager;

1
Telegram/SourceFiles/media/player/media_player_instance.cpp
View file

@ -765,6 +765,7 @@ auto Media::Player::Instance::seekingChanges(AudioMsgId::Type type) const
not_null<Instance*> instance() { not_null<Instance*> instance() {
Expects(SingleInstance != nullptr); Expects(SingleInstance != nullptr);
return SingleInstance; return SingleInstance;
} }