From 31346dde58090fed76333272d5593ef24eae96e4 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 27 Sep 2013 13:55:28 +0200
Subject: [PATCH] fixed uninitialise scope value for filters

---
 apps/opencs/view/filter/filtercreator.cpp | 16 +++++++++++++++-
 apps/opencs/view/filter/filtercreator.hpp |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/filter/filtercreator.cpp b/apps/opencs/view/filter/filtercreator.cpp
index 47925ea57..640c9fe78 100644
--- a/apps/opencs/view/filter/filtercreator.cpp
+++ b/apps/opencs/view/filter/filtercreator.cpp
@@ -6,6 +6,11 @@
 
 #include "../../model/filter/filter.hpp"
 
+#include "../../model/world/data.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/columns.hpp"
+#include "../../model/world/idtable.hpp"
+
 std::string CSVFilter::FilterCreator::getNamespace() const
 {
     switch (mScope->currentIndex())
@@ -28,6 +33,15 @@ std::string CSVFilter::FilterCreator::getId() const
     return getNamespace() + GenericCreator::getId();
 }
 
+void CSVFilter::FilterCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const
+{
+    int index =
+        dynamic_cast<CSMWorld::IdTable&> (*getData().getTableModel (getCollectionId())).
+        findColumnIndex (CSMWorld::Columns::ColumnId_Scope);
+
+    command.addValue (index, mScope->currentIndex());
+}
+
 CSVFilter::FilterCreator::FilterCreator (CSMWorld::Data& data, QUndoStack& undoStack,
     const CSMWorld::UniversalId& id)
 : GenericCreator (data, undoStack, id)
@@ -39,7 +53,7 @@ CSVFilter::FilterCreator::FilterCreator (CSMWorld::Data& data, QUndoStack& undoS
 
     mScope->addItem ("Project");
     mScope->addItem ("Session");
-    /// \ŧodo re-enable for OpenMW 1.1
+    /// \todo re-enable for OpenMW 1.1
     // mScope->addItem ("Content");
 
     connect (mScope, SIGNAL (currentIndexChanged (int)), this, SLOT (setScope (int)));
diff --git a/apps/opencs/view/filter/filtercreator.hpp b/apps/opencs/view/filter/filtercreator.hpp
index 82d38d22c..437d01c8d 100644
--- a/apps/opencs/view/filter/filtercreator.hpp
+++ b/apps/opencs/view/filter/filtercreator.hpp
@@ -25,6 +25,8 @@ namespace CSVFilter
 
             virtual std::string getId() const;
 
+            virtual void configureCreateCommand (CSMWorld::CreateCommand& command) const;
+
         public:
 
             FilterCreator (CSMWorld::Data& data, QUndoStack& undoStack,