git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index fa3a94cb9b763f22406a720b93ba0a93df1539a0..7af863ed901b2d336409ecf15b2371672591f013 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -306,6 +306,7 @@ public:
        \r
        virtual void initialize(const core::video_format_desc& format_desc)\r
        {\r
+               consumer_ = nullptr;\r
                consumer_.reset(new bluefish_consumer(format_desc, device_index_, embedded_audio_, key_only_));\r
        }\r
        \r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 7db20744fbcb0a9a02d3966c61f6694e7fe873f6..9895fac1017938bf67154049f9399b55d997cc73 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -439,6 +439,7 @@ public:
                        co_init(){CoInitialize(nullptr);}\r
                        ~co_init(){CoUninitialize();}\r
                } init;         \r
+               context_ = nullptr;\r
                context_.reset(new decklink_consumer(config_, format_desc_));           \r
                                \r
                CASPAR_LOG(info) << print() << L" Successfully Initialized.";   \r

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index eda701e2941906b9c154a4e54b90e829b1105b1c..5048e023d23680cfeefc77b3cdc0babb76ca6762 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -444,6 +444,7 @@ public:
        \r
        virtual void initialize(const core::video_format_desc& format_desc)\r
        {\r
+               consumer_.reset();\r
                consumer_.reset(new ogl_consumer(config_, format_desc));\r
        }\r
        \r