From f7c7aeecb3c188db6b5274acef45ac717976d966 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 21 Apr 2015 14:44:51 +0200
Subject: [PATCH 1/3] fixed missing state update when starting a global search

---
 apps/opencs/model/doc/document.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index cb3b4ba18..31d0aaccd 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -2382,7 +2382,8 @@ CSMWorld::UniversalId CSMDoc::Document::newSearch()
 
 void CSMDoc::Document::runSearch (const CSMWorld::UniversalId& searchId, const CSMTools::Search& search)
 {
-    return mTools.runSearch (searchId, search);
+    mTools.runSearch (searchId, search);
+    emit stateChanged (getState(), this);
 }
 
 void CSMDoc::Document::abortOperation (int type)

From 82bc666e002af107a32dbc1f06bce8b4de9cf1b7 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Wed, 22 Apr 2015 09:25:55 +1000
Subject: [PATCH 2/3] Make AI package items to be editable when a new row is
 added.

---
 apps/opencs/model/world/refidadapterimp.hpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index d3d52d2e1..41d8c65d5 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -1363,7 +1363,13 @@ namespace CSMWorld
             std::vector<ESM::AIPackage>& list = actor.mAiPackage.mList;
 
             ESM::AIPackage newRow;
-            newRow.mType = ESM::AI_CNDT;
+            newRow.mType = ESM::AI_Wander;
+            newRow.mWander.mDistance = 0;
+            newRow.mWander.mDuration = 0;
+            newRow.mWander.mTimeOfDay = 0;
+            for (int i = 0; i < 8; ++i)
+                newRow.mWander.mIdle[i] = 0;
+            newRow.mWander.mShouldRepeat = 0;
             newRow.mCellName = "";
 
             if (position >= (int)list.size())

From 6fcf4ea9e3fdf445ba282a029f63b4d84ac1d8c4 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 23 Apr 2015 14:24:43 +0200
Subject: [PATCH 3/3] In ModifyCommand replace proxy model with the source
 model (Fixes #2498)

---
 apps/opencs/model/world/commands.cpp | 21 +++++++++++++++------
 apps/opencs/model/world/commands.hpp |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index d12c5d228..ce82e07bf 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -1,28 +1,37 @@
 #include "commands.hpp"
 
+#include <components/misc/stringops.hpp>
+
 #include <QAbstractItemModel>
+#include <QAbstractProxyModel>
 
 #include "idtable.hpp"
 #include "idtree.hpp"
-#include <components/misc/stringops.hpp>
 #include "nestedtablewrapper.hpp"
 
 CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
                                         const QVariant& new_, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mIndex (index), mNew (new_)
+: QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_)
 {
-    setText ("Modify " + mModel.headerData (mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
+    if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (&model))
+    {
+        // Replace proxy with actual model
+        mIndex = proxy->mapToSource (index);
+        mModel = proxy->sourceModel();
+    }
+
+    setText ("Modify " + mModel->headerData (mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
 }
 
 void CSMWorld::ModifyCommand::redo()
 {
-    mOld = mModel.data (mIndex, Qt::EditRole);
-    mModel.setData (mIndex, mNew);
+    mOld = mModel->data (mIndex, Qt::EditRole);
+    mModel->setData (mIndex, mNew);
 }
 
 void CSMWorld::ModifyCommand::undo()
 {
-    mModel.setData (mIndex, mOld);
+    mModel->setData (mIndex, mOld);
 }
 
 
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index a70b36178..2bd47ae91 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -26,7 +26,7 @@ namespace CSMWorld
 
     class ModifyCommand : public QUndoCommand
     {
-            QAbstractItemModel& mModel;
+            QAbstractItemModel *mModel;
             QModelIndex mIndex;
             QVariant mNew;
             QVariant mOld;