fix on() to support current_scheduler (facebookexperimental#162)

fix on() to support current_scheduler
steve-downey · Aug 12, 2020 · c266ef5 · c266ef5
1 parent cf1ac7d
commit c266ef5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/include/unifex/on.hpp b/include/unifex/on.hpp
@@ -42,10 +42,13 @@ namespace _on {
         (requires sender<Sender> AND scheduler<Scheduler> AND //
           (!tag_invocable<_fn, Sender, Scheduler>))
     auto operator()(Sender&& sender, Scheduler&& scheduler) const {
-      return with_query_value(
-          sequence(schedule(), (Sender&&)sender),
+      auto sndr = schedule(scheduler);
+      return sequence(
+        std::move(sndr),
+        with_query_value(
+          (Sender&&)sender,
           get_scheduler,
-          (Scheduler&&)scheduler);
+          (Scheduler&&)scheduler));
     }
   } on{};
 } // namespace _on