git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3364...

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 9e7a0d90914f9e48e5fede835950f5add42db8ac..4c3647ef448efce34835e27be85ab667a18c9e9e 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -191,8 +191,7 @@ public:
                                std::map<int, boost::unique_future<bool>> send_results;\r
 \r
                                // Start invocations\r
-                               auto it = consumers_.begin();\r
-                               while(it != consumers_.end())\r
+                               for (auto it = consumers_.begin(); it != consumers_.end(); ++it)\r
                                {\r
                                        auto consumer   = it->second;\r
                                        auto frame              = frames_.at(consumer->buffer_depth()-minmax.first);\r
@@ -215,13 +214,10 @@ public:
                                                        consumers_.erase(it);\r
                                                }\r
                                        }\r
-\r
-                                       ++it;\r
                                }\r
 \r
                                // Retrieve results\r
-                               auto result_it = send_results.begin();\r
-                               while(result_it != send_results.end())\r
+                               for (auto result_it = send_results.begin(); result_it != send_results.end(); ++result_it)\r
                                {\r
                                        auto consumer           = consumers_.at(result_it->first);\r
                                        auto frame                      = frames_.at(consumer->buffer_depth()-minmax.first);\r
@@ -254,8 +250,6 @@ public:
                                                        consumers_.erase(result_it->first);\r
                                                }\r
                                        }\r
-\r
-                                       ++result_it;\r
                                }\r
                                                \r
                                graph_->set_value("consume-time", consume_timer_.elapsed()*format_desc_.fps*0.5);\r