From 319ed2f9b86372fa604535cde1f1117e0fdd6793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Fri, 10 Nov 2017 15:23:44 +0100
Subject: [PATCH] disable 360 screenshots in vanity/preview mode

---
 apps/openmw/mwbase/world.hpp              | 2 +-
 apps/openmw/mwinput/inputmanagerimp.cpp   | 7 +++----
 apps/openmw/mwrender/renderingmanager.cpp | 7 ++++++-
 apps/openmw/mwrender/renderingmanager.hpp | 2 +-
 apps/openmw/mwworld/worldimp.cpp          | 4 ++--
 apps/openmw/mwworld/worldimp.hpp          | 2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 6d39229f0..f91d1bc2a 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -450,7 +450,7 @@ namespace MWBase
 
             /// \todo this does not belong here
             virtual void screenshot (osg::Image* image, int w, int h) = 0;
-            virtual void screenshot360 (osg::Image* image) = 0;
+            virtual bool screenshot360 (osg::Image* image) = 0;
 
             /// Find default position inside exterior cell specified by name
             /// \return false if exterior with given name not exists, true otherwise
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 9ea1f8e16..bbd6feb66 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -1028,10 +1028,9 @@ namespace MWInput
     void InputManager::screenshot360()
     {
         osg::ref_ptr<osg::Image> screenshot (new osg::Image);
-        MWBase::Environment::get().getWorld()->screenshot360(screenshot.get());
-
-        // calling mScreenCaptureHandler->getCaptureOperation() here caused segfault for some reason
-        (*mScreenCaptureOperation) (*(screenshot.get()),0);
+        if (MWBase::Environment::get().getWorld()->screenshot360(screenshot.get()))
+            (*mScreenCaptureOperation) (*(screenshot.get()),0);
+            // calling mScreenCaptureHandler->getCaptureOperation() here caused segfault for some reason
     }
 
     void InputManager::toggleInventory()
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 6b94c72f8..aefc55c39 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -771,8 +771,11 @@ namespace MWRender
         int mSize;
     };
 
-    void RenderingManager::screenshot360(osg::Image* image)
+    bool RenderingManager::screenshot360(osg::Image* image)
     {
+        if (mCamera->isVanityOrPreviewModeEnabled())
+            return false;
+
         int screenshotWidth = Settings::Manager::tryGetInt("s360 width","Video",mViewer->getCamera()->getViewport()->width());
         int screenshotHeight = Settings::Manager::tryGetInt("s360 height","Video",mViewer->getCamera()->getViewport()->height());
         SphericalScreenshot::SphericalScreenshotMapping mapping = static_cast<SphericalScreenshot::SphericalScreenshotMapping>(
@@ -811,6 +814,8 @@ namespace MWRender
 
         mPlayerAnimation->getObjectRoot()->setNodeMask(maskBackup);
         mFieldOfView = fovBackup;
+
+        return true;
     }
 
     void RenderingManager::screenshot(osg::Image *image, int w, int h, osg::Vec3 direction, bool disableWaterEffects)
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index cb0723397..a4cb9bf8f 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -126,7 +126,7 @@ namespace MWRender
 
         /// Take a screenshot of w*h onto the given image, not including the GUI.
         void screenshot(osg::Image* image, int w, int h, osg::Vec3 direction=osg::Vec3(0,0,-1), bool disableWaterEffects=false);
-        void screenshot360(osg::Image* image);
+        bool screenshot360(osg::Image* image);
 
         struct RayResult
         {
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f51f9af3d..0d0079677 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2281,9 +2281,9 @@ namespace MWWorld
         mRendering->screenshot(image, w, h);
     }
     
-    void World::screenshot360 (osg::Image* image)
+    bool World::screenshot360(osg::Image* image)
     {
-        mRendering->screenshot360(image);
+        return mRendering->screenshot360(image);
     }
 
     void World::activateDoor(const MWWorld::Ptr& door)
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index a68982412..3a54d28ae 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -560,7 +560,7 @@ namespace MWWorld
 
             /// \todo this does not belong here
             void screenshot (osg::Image* image, int w, int h) override;
-            void screenshot360 (osg::Image* image) override;
+            bool screenshot360 (osg::Image* image) override;
 
             /// Find center of exterior cell above land surface
             /// \return false if exterior with given name not exists, true otherwise