diff --git a/‎td/telegram/PollManager.cpp‎
Lines changed: 4 additions & 4 deletions b/‎td/telegram/PollManager.cpp‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎td/telegram/PollOption.h‎
Lines changed: 4 additions & 3 deletions b/‎td/telegram/PollOption.h‎
Lines changed: 4 additions & 3 deletions
@@ -368,7 +368,7 @@ class PollManager::UploadPollOptionContentCallback final : public MessageQueryMa
 
   void on_failed_to_upload_message_content_thumbnail(MessageContentUploadId upload_id, int32 media_pos) final {
     auto &query = manager_->add_poll_option_queries_[upload_id];
-    delete_message_content_thumbnail(manager_->td_, query.option_.get_media_ref(), media_pos);
+    delete_message_content_thumbnail(manager_->td_, query.option_.get_message_content_ref().get(), media_pos);
   }
 };
 
@@ -1265,7 +1265,7 @@ void PollManager::set_poll_answer(MessageFullId message_full_id, vector<int32> &
     affected_option_ids[index + 1]++;
   }
   for (size_t option_index = 0; option_index < poll->options_.size(); option_index++) {
-    if (poll->options_[option_index].is_chosen_) {
+    if (poll->options_[option_index].is_chosen()) {
       if (poll->has_revoting_disabled_) {
         return promise.set_error(400, "Can't revote in a quiz");
       }
@@ -1996,7 +1996,7 @@ vector<MessageContent *> PollManager::get_individual_message_content_refs(PollId
   message_contents.push_back(attached_media);
   message_contents.push_back(poll->explanation_media_.get());
   for (auto &option : poll->options_) {
-    message_contents.push_back(option.get_media_ref());
+    message_contents.push_back(option.get_message_content_ref().get());
   }
   return message_contents;
 }
@@ -2029,7 +2029,7 @@ unique_ptr<MessageContent> &PollManager::get_individual_message_content(PollId p
   }
   auto pos = static_cast<size_t>(media_pos - 2);
   CHECK(pos < poll->options_.size());
-  return poll->options_[pos].media_;
+  return poll->options_[pos].get_message_content_ref();
 }
 
 PollId PollManager::dup_poll(DialogId dialog_id, PollId poll_id) {
 
@@ -27,7 +27,7 @@ class Dependencies;
 class MessageContent;
 class Td;
 
-struct PollOption {
+class PollOption {
   FormattedText text_;
   unique_ptr<MessageContent> media_;
   DialogId added_by_dialog_id_;
@@ -38,6 +38,7 @@ struct PollOption {
 
   friend bool operator==(const PollOption &lhs, const PollOption &rhs);
 
+ public:
   PollOption() = default;
 
   PollOption(FormattedText &&text, unique_ptr<MessageContent> &&media);
@@ -59,8 +60,8 @@ struct PollOption {
     return media_.get();
   }
 
-  MessageContent *get_media_ref() {
-    return media_.get();
+  unique_ptr<MessageContent> &get_message_content_ref() {
+    return media_;
   }
 
   unique_ptr<MessageContent> get_text_message_content() const;
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ class PollManager::UploadPollOptionContentCallback final : public MessageQueryMa`
`368`	`368`
`369`	`369`	`void on_failed_to_upload_message_content_thumbnail(MessageContentUploadId upload_id, int32 media_pos) final {`
`370`	`370`	`auto &query = manager_->add_poll_option_queries_[upload_id];`
`371`		`- delete_message_content_thumbnail(manager_->td_, query.option_.get_media_ref(), media_pos);`
	`371`	`+ delete_message_content_thumbnail(manager_->td_, query.option_.get_message_content_ref().get(), media_pos);`
`372`	`372`	`}`
`373`	`373`	`};`
`374`	`374`
`@@ -1265,7 +1265,7 @@ void PollManager::set_poll_answer(MessageFullId message_full_id, vector<int32> &`
`1265`	`1265`	`affected_option_ids[index + 1]++;`
`1266`	`1266`	`}`
`1267`	`1267`	`for (size_t option_index = 0; option_index < poll->options_.size(); option_index++) {`
`1268`		`- if (poll->options_[option_index].is_chosen_) {`
	`1268`	`+ if (poll->options_[option_index].is_chosen()) {`
`1269`	`1269`	`if (poll->has_revoting_disabled_) {`
`1270`	`1270`	`return promise.set_error(400, "Can't revote in a quiz");`
`1271`	`1271`	`}`
`@@ -1996,7 +1996,7 @@ vector<MessageContent *> PollManager::get_individual_message_content_refs(PollId`
`1996`	`1996`	`message_contents.push_back(attached_media);`
`1997`	`1997`	`message_contents.push_back(poll->explanation_media_.get());`
`1998`	`1998`	`for (auto &option : poll->options_) {`
`1999`		`- message_contents.push_back(option.get_media_ref());`
	`1999`	`+ message_contents.push_back(option.get_message_content_ref().get());`
`2000`	`2000`	`}`
`2001`	`2001`	`return message_contents;`
`2002`	`2002`	`}`
`@@ -2029,7 +2029,7 @@ unique_ptr<MessageContent> &PollManager::get_individual_message_content(PollId p`
`2029`	`2029`	`}`
`2030`	`2030`	`auto pos = static_cast<size_t>(media_pos - 2);`
`2031`	`2031`	`CHECK(pos < poll->options_.size());`
`2032`		`- return poll->options_[pos].media_;`
	`2032`	`+ return poll->options_[pos].get_message_content_ref();`
`2033`	`2033`	`}`
`2034`	`2034`
`2035`	`2035`	`PollId PollManager::dup_poll(DialogId dialog_id, PollId poll_id) {`