From 42e5b62cd602c16f6b378625723422eebc03e594 Mon Sep 17 00:00:00 2001
From: Conatum <cona@thewisewolf.dev>
Date: Thu, 10 Aug 2023 15:33:28 +0300
Subject: [PATCH] fix (rolemenus): Bugfixes.

---
 src/modules/rolemenus/cog.py           | 2 ++
 src/modules/rolemenus/ui/menueditor.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/rolemenus/cog.py b/src/modules/rolemenus/cog.py
index 7d6d0ff4..ffd51543 100644
--- a/src/modules/rolemenus/cog.py
+++ b/src/modules/rolemenus/cog.py
@@ -351,6 +351,8 @@ class RoleMenuCog(LionCog):
 
         Set _message and messageid to None.
         """
+        if not message.guild:
+            return
         menuid = self.live_menus[message.guild.id].get(message.id, None)
         if menuid is not None:
             menu = await RoleMenu.fetch(self.bot, menuid)
diff --git a/src/modules/rolemenus/ui/menueditor.py b/src/modules/rolemenus/ui/menueditor.py
index e38b15a2..3af0101f 100644
--- a/src/modules/rolemenus/ui/menueditor.py
+++ b/src/modules/rolemenus/ui/menueditor.py
@@ -1104,7 +1104,7 @@ class MenuEditor(MessageUI):
             self.preview_button, self.edit_msg_button, self.repost_button,
         )
         if self.page_count > 1:
-            line_1 = (self.prev_page_button, *line_last, self.next_page_button)
+            line_1 = (self.prev_page_button, *line_1, self.next_page_button)
         if self.mode is EditorMode.OPTIONS:
             self.set_layout(
                 line_1,