From 561e27e182c14a7ba0b0884668c3b9755e839dfe Mon Sep 17 00:00:00 2001
From: tobiglaser <76131623+tobiglaser@users.noreply.github.com>
Date: Fri, 5 Aug 2022 18:05:29 +0200
Subject: [PATCH] Hotfix of CommandList move: no more segFaults
---
src/CommandListOWN.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/CommandListOWN.cpp b/src/CommandListOWN.cpp
index ce538a8..c3edacb 100644
--- a/src/CommandListOWN.cpp
+++ b/src/CommandListOWN.cpp
@@ -192,7 +192,10 @@ std::shared_ptr<ICommand> CommandList::moveUp(unsigned int _pos)
prevPtr->getPrev()->setNext(ptr);
ptr->setPrev(prevPtr->getPrev());
- ptr->getNext()->setPrev(prevPtr);
+ if (ptr->getNext() != nullptr) // -> not last element
+ {
+ ptr->getNext()->setPrev(prevPtr);
+ }
prevPtr->setNext(ptr->getNext());
prevPtr->setPrev(ptr);
@@ -221,7 +224,10 @@ std::shared_ptr<ICommand> CommandList::moveDown(unsigned int _pos)
ptr->getPrev()->setNext(nextPtr);
nextPtr->setPrev(ptr->getPrev());
- nextPtr->getNext()->setPrev(ptr);
+ if (nextPtr->getNext() != nullptr) // -> not pre last element
+ {
+ nextPtr->getNext()->setPrev(ptr);
+ }
ptr->setNext(nextPtr->getNext());
ptr->setPrev(nextPtr);
--
GitLab