[Seq-cvs-commit] SF.net SVN: seq:[1109] showeq/branches/pre_6_0_beta/src

[<cn...@us...>]

Revision: 1109
          http://sourceforge.net/p/seq/svn/1109
Author:   cn187
Date:     2020-11-17 23:54:11 +0000 (Tue, 17 Nov 2020)
Log Message:
-----------
Revert "Don't automatically select next spawn in list when current target despawns"

Revert previous commit due to unexpected issues.

Modified Paths:
--------------
    showeq/branches/pre_6_0_beta/src/spawnlist.cpp
    showeq/branches/pre_6_0_beta/src/spawnlist2.cpp

Modified: showeq/branches/pre_6_0_beta/src/spawnlist.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlist.cpp	2020-11-17 20:54:18 UTC (rev 1108)
+++ showeq/branches/pre_6_0_beta/src/spawnlist.cpp	2020-11-17 23:54:11 UTC (rev 1109)
@@ -463,12 +463,6 @@
      // if there was an item, delete it and all it's children
      if (j)
      {
-       if (j == currentItem())
-       {
-           selectionModel()->setCurrentIndex(QModelIndex(), QItemSelectionModel::NoUpdate);
-           clearSelection();
-       }
-
        delList += j->takeChildren();
 
        // get the category that the item SpawnListItem belongs to
@@ -771,7 +765,7 @@
     children.clear();
 
     // remove the item from the category list
-    delete m_categoryListItems.take(litem);
+    delete m_categoryListItems.take((void*)cat);
   }
 }
 

Modified: showeq/branches/pre_6_0_beta/src/spawnlist2.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlist2.cpp	2020-11-17 20:54:18 UTC (rev 1108)
+++ showeq/branches/pre_6_0_beta/src/spawnlist2.cpp	2020-11-17 23:54:11 UTC (rev 1109)
@@ -289,20 +289,16 @@
   // find the list item
   SpawnListItem* litem = find(item);
 
-  if (item == m_selectedItem)
-  {
-    m_selectedItem = NULL;
-    m_spawnList->clearSelection();
-  }
-
   // delete the list item
   if (litem != NULL)
   {
-    delete m_spawnListItemDict.take(litem);
+    delete m_spawnListItemDict.take((void*)item);
 
     updateCount();
   }
 
+  if (item == m_selectedItem)
+    m_selectedItem = NULL;
 }
 
 void SpawnListWindow2::changeItem(const Item* item, uint32_t changeItem)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.