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

diff --git a/modules/screen/consumer/screen_consumer.cpp b/modules/screen/consumer/screen_consumer.cpp
index 60404d5e3c0973f1e24aa1beffc9ab20ee33c192..ba52cf78befc3bf83ef1097e3da970f443bcac58 100644 (file)
--- a/modules/screen/consumer/screen_consumer.cpp
+++ b/modules/screen/consumer/screen_consumer.cpp
@@ -528,9 +528,8 @@ spl::shared_ptr<core::frame_consumer> create_consumer(const std::vector<std::wst
        \r
        configuration config;\r
                \r
-       auto device_it = std::find(params.begin(), params.end(), L"DEVICE");\r
-       if(device_it != params.end() && ++device_it != params.end())\r
-               config.screen_index = boost::lexical_cast<int>(*device_it);\r
+       if(params.size() > 1)\r
+               config.screen_index = boost::lexical_cast<int>(params[1]);\r
                \r
        config.key_only = std::find(params.begin(), params.end(), L"WINDOWED") != params.end();\r
        config.key_only = std::find(params.begin(), params.end(), L"KEY_ONLY") != params.end();\r