Merge pull request #11525 from alalek:issue_11511

336841fa · Alexander Alekhin · ea75e7f0 · f42fca9f · 336841fa
Commit 336841fa authored May 16, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

cuda_stream.cpp modules/core/src/cuda_stream.cpp +3 -2

No files found.
--- a/modules/core/src/cuda_stream.cpp
+++ b/modules/core/src/cuda_stream.cpp
@@ -594,10 +594,11 @@ namespace

    StackAllocator::~StackAllocator()
    {
-        cudaStreamSynchronize(stream_);
-
        if (memStack_ != 0)
+        {
+            cudaStreamSynchronize(stream_);
            memStack_->pool->returnMemStack(memStack_);
+        }
    }

    size_t alignUp(size_t what, size_t alignment)