aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/widgets/WideBar.cpp
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2023-07-22 11:26:02 +0100
committerGitHub <noreply@github.com>2023-07-22 11:26:02 +0100
commit57430fd189aed592a170d597de61b3acabaaa43d (patch)
treeb3727db40fdea31d24541c0c8181c43df13e774c /launcher/ui/widgets/WideBar.cpp
parentec85266860b7503b24ff3840fb6bf74588acc7c8 (diff)
parent6ffcfcd7e9d96ae0a2846d1cf23b27425a838709 (diff)
downloadPrismLauncher-57430fd189aed592a170d597de61b3acabaaa43d.tar.gz
PrismLauncher-57430fd189aed592a170d597de61b3acabaaa43d.tar.bz2
PrismLauncher-57430fd189aed592a170d597de61b3acabaaa43d.zip
Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
Diffstat (limited to 'launcher/ui/widgets/WideBar.cpp')
-rw-r--r--launcher/ui/widgets/WideBar.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/launcher/ui/widgets/WideBar.cpp b/launcher/ui/widgets/WideBar.cpp
index ac34e3aa..a77c45fe 100644
--- a/launcher/ui/widgets/WideBar.cpp
+++ b/launcher/ui/widgets/WideBar.cpp
@@ -116,12 +116,21 @@ void WideBar::insertActionAfter(QAction* after, QAction* action)
if (iter == m_entries.end())
return;
+ iter++;
+ // the action to insert after is present
+ // however, the element after it isn't valid
+ if (iter == m_entries.end()) {
+ // append the action instead of inserting it
+ addAction(action);
+ return;
+ }
+
BarEntry entry;
- entry.bar_action = insertWidget((iter + 1)->bar_action, new ActionButton(action, this, m_use_default_action));
+ entry.bar_action = insertWidget(iter->bar_action, new ActionButton(action, this, m_use_default_action));
entry.menu_action = action;
entry.type = BarEntry::Type::Action;
- m_entries.insert(iter + 1, entry);
+ m_entries.insert(iter, entry);
m_menu_state = MenuState::Dirty;
}