Avoid modifying data in display commands

Fixes #2837

Author: hluk

src/item/persistentdisplayitem.cpp

@@ -2,6 +2,7 @@
 
 #include "persistentdisplayitem.h"
 
+#include "common/mimetypes.h"
 #include "gui/traymenu.h"
 #include "item/itemdelegate.h"
 
@@ -27,6 +28,9 @@ PersistentDisplayItem::PersistentDisplayItem(ItemDelegate *delegate,
     , m_widget(widget)
     , m_delegate(delegate)
 {
+    // Avoid accessing current selection in Display commands.
+    if ( !m_data.contains(mimeCurrentTab) )
+        m_data[mimeSelectedItems] = QByteArray();
 }
 
 PersistentDisplayItem::PersistentDisplayItem(QAction *action, const QVariantMap &data)

src/scriptable/scriptable.cpp

@@ -1641,7 +1641,9 @@ QJSValue Scriptable::setData()
     if ( !toItemData(argument(1), mime, &m_data) )
         return false;
 
-    m_proxy->setSelectedItemsData(mime, m_data.value(mime));
+    if (!m_modifyDisplayDataOnly)
+        m_proxy->setSelectedItemsData(mime, m_data.value(mime));
+
     return true;
 }
 
@@ -1651,7 +1653,10 @@ QJSValue Scriptable::removeData()
 
     const QString mime = arg(0);
     m_data.remove(mime);
-    m_proxy->setSelectedItemsData(mime, QVariant());
+
+    if (!m_modifyDisplayDataOnly)
+        m_proxy->setSelectedItemsData(mime, QVariant());
+
     return true;
 }
 
@@ -2487,6 +2492,8 @@ QJSValue Scriptable::runAutomaticCommands()
 
 void Scriptable::runDisplayCommands()
 {
+    m_modifyDisplayDataOnly = true;
+
     QEventLoop loop;
     connect(this, &Scriptable::finished, &loop, [&]() {
         if (m_abort == Abort::AllEvaluations)
@@ -2526,6 +2533,8 @@ void Scriptable::runDisplayCommands()
 
     if (m_abort == Abort::None)
         loop.exec();
+
+    m_modifyDisplayDataOnly = false;
 }
 
 void Scriptable::runMenuCommandFilters()

src/scriptable/scriptable.h

@@ -488,7 +488,7 @@ public slots:
     Abort m_abort = Abort::None;
     int m_skipArguments = 0;
 
-    bool m_displayFunctionsLock = false;
+    bool m_modifyDisplayDataOnly = false;
 
     QJSValue m_plugins;