From c2321c502f2c7969a4761cab563c9cffcbe95e30 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Wed, 9 Dec 2020 23:19:02 +0100
Subject: [PATCH] Ensure that the moveTreeItem function exits properly if no
 item to be moved is selected

---
 nw/gui/projtree.py | 52 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/nw/gui/projtree.py b/nw/gui/projtree.py
index dcd7e448..a556b044 100644
--- a/nw/gui/projtree.py
+++ b/nw/gui/projtree.py
@@ -286,36 +286,36 @@ class GuiProjectTree(QTreeWidget):
             logger.error("No project open")
             return False
 
-        hasFocus = qApp.focusWidget() == self or not self.mainConf.showGUI
-        if hasFocus and self.theParent.hasProject:
+        if qApp.focusWidget() != self and self.mainConf.showGUI:
+            return False
 
-            tHandle = self.getSelectedHandle()
-            tItem = self._getTreeItem(tHandle)
-            pItem = tItem.parent()
-            if pItem is None:
-                tIndex = self.indexOfTopLevelItem(tItem)
-                nChild = self.topLevelItemCount()
-                nIndex = tIndex + nStep
-                if nIndex < 0 or nIndex >= nChild:
-                    return False
-                cItem = self.takeTopLevelItem(tIndex)
-                self.insertTopLevelItem(nIndex, cItem)
+        tHandle = self.getSelectedHandle()
+        tItem = self._getTreeItem(tHandle)
+        if tItem is None:
+            return False
 
-            else:
-                tIndex = pItem.indexOfChild(tItem)
-                nChild = pItem.childCount()
-                nIndex = tIndex + nStep
-                if nIndex < 0 or nIndex >= nChild:
-                    return False
-                cItem = pItem.takeChild(tIndex)
-                pItem.insertChild(nIndex, cItem)
-
-            self.clearSelection()
-            cItem.setSelected(True)
-            self._setTreeChanged(True)
+        pItem = tItem.parent()
+        if pItem is None:
+            tIndex = self.indexOfTopLevelItem(tItem)
+            nChild = self.topLevelItemCount()
+            nIndex = tIndex + nStep
+            if nIndex < 0 or nIndex >= nChild:
+                return False
+            cItem = self.takeTopLevelItem(tIndex)
+            self.insertTopLevelItem(nIndex, cItem)
 
         else:
-            return False
+            tIndex = pItem.indexOfChild(tItem)
+            nChild = pItem.childCount()
+            nIndex = tIndex + nStep
+            if nIndex < 0 or nIndex >= nChild:
+                return False
+            cItem = pItem.takeChild(tIndex)
+            pItem.insertChild(nIndex, cItem)
+
+        self.clearSelection()
+        cItem.setSelected(True)
+        self._setTreeChanged(True)
 
         return True