diff --git a/Telegram/SourceFiles/intro/intro_widget.cpp b/Telegram/SourceFiles/intro/intro_widget.cpp index 34f7b0a3cd..8b7024a965 100644 --- a/Telegram/SourceFiles/intro/intro_widget.cpp +++ b/Telegram/SourceFiles/intro/intro_widget.cpp @@ -63,10 +63,12 @@ using namespace ::Intro::details; Widget::Widget( QWidget *parent, + not_null controller, not_null account, EnterPoint point) : RpWidget(parent) , _account(account) +, _data(details::Data{ .controller = controller }) , _back(this, object_ptr(this, st::introBackButton)) , _settings( this, diff --git a/Telegram/SourceFiles/intro/intro_widget.h b/Telegram/SourceFiles/intro/intro_widget.h index cc031d1659..74840ea3de 100644 --- a/Telegram/SourceFiles/intro/intro_widget.h +++ b/Telegram/SourceFiles/intro/intro_widget.h @@ -29,6 +29,7 @@ class FadeWrap; namespace Window { class ConnectionState; +class Controller; } // namespace Window namespace Intro { @@ -42,6 +43,9 @@ enum class CallStatus { }; struct Data { + // Required for the UserpicButton. + const not_null controller; + QString country; QString phone; QByteArray phoneHash; @@ -91,6 +95,7 @@ class Widget public: Widget( QWidget *parent, + not_null controller, not_null account, EnterPoint point); diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index e344f799a8..8e1f623154 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -294,7 +294,11 @@ void MainWindow::setupIntro(Intro::EnterPoint point) { auto bg = animated ? grabInner() : QPixmap(); destroyLayer(); - auto created = object_ptr(bodyWidget(), &account(), point); + auto created = object_ptr( + bodyWidget(), + &controller(), + &account(), + point); created->showSettingsRequested( ) | rpl::start_with_next([=] { showSettings();