diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp index bae93788d..049cc9e5b 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp @@ -397,7 +397,9 @@ QString Controller::getUsernameInput() const { } std::vector Controller::usernamesOrder() const { - return _controls.usernamesList->order(); + return _controls.usernamesList + ? _controls.usernamesList->order() + : std::vector(); } object_ptr Controller::createUsernameEdit() { @@ -452,12 +454,17 @@ object_ptr Controller::createUsernameEdit() { container, tr::lng_create_channel_link_about()); - const auto focusCallback = [=] { - _scrollToRequests.fire(container->y()); - _controls.usernameInput->setFocusFast(); - }; - _controls.usernamesList = container->add( - object_ptr(container, channel, _show, focusCallback)); + if (channel) { + const auto focusCallback = [=] { + _scrollToRequests.fire(container->y()); + _controls.usernameInput->setFocusFast(); + }; + _controls.usernamesList = container->add(object_ptr( + container, + channel, + _show, + focusCallback)); + } QObject::connect( _controls.usernameInput,