Merge pull request #310 from OpenMW/master while resolving conflicts

# Conflicts:
#	CMakeLists.txt

CMakeLists.txt

@@ -537,6 +537,7 @@ if(WIN32)
     SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.openmw.org")
     SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.openmw.org")
     SET(CPACK_NSIS_INSTALLED_ICON_NAME "openmw-launcher.exe")
+    SET(CPACK_NSIS_MUI_FINISHPAGE_RUN "openmw-launcher.exe")
     SET(CPACK_NSIS_MUI_ICON "${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp.ico")
     SET(CPACK_NSIS_MUI_UNIICON "${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp.ico")
     SET(CPACK_PACKAGE_ICON "${OpenMW_SOURCE_DIR}\\\\files\\\\openmw.bmp")

apps/openmw/mwgui/containeritemmodel.cpp

@@ -142,6 +142,9 @@ void ContainerItemModel::update()
 
         for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
         {
+            if (!(*it).getClass().showsInInventory(*it))
+                continue;
+
             std::vector<ItemStack>::iterator itemStack = mItems.begin();
             for (; itemStack != mItems.end(); ++itemStack)
             {

apps/openmw/mwgui/trainingwindow.cpp

@@ -203,4 +203,10 @@ namespace MWGui
         checkReferenceAvailable();
         mTimeAdvancer.onFrame(dt);
     }
+
+    bool TrainingWindow::exit()
+    {
+        return !mTimeAdvancer.isRunning();
+    }
+
 }

apps/openmw/mwgui/trainingwindow.hpp

@@ -16,7 +16,7 @@ namespace MWGui
 
         virtual void onOpen();
 
-        bool exit() { return false; }
+        bool exit();
 
         void setPtr(const MWWorld::Ptr& actor);