diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-09 19:20:58 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-09 19:20:58 +0300 |
| commit | 60799d6fee256427bcac7c0ca30d5197b4eddbc1 (patch) | |
| tree | 62a9c42a0b5b376097c64788228d7b27b97d2cce /intern/cycles/render | |
| parent | 513bc5954c714edfbc4a48dff118ac6b83f9a7bb (diff) | |
| parent | 49e3f08815af17704e94c0e9eba0c6228a43972a (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/session.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 2d1f60c722b..cb02d1f900c 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -129,7 +129,9 @@ Session::~Session() void Session::start() { - session_thread = new thread(function_bind(&Session::run, this)); + if (!session_thread) { + session_thread = new thread(function_bind(&Session::run, this)); + } } bool Session::ready_to_reset() @@ -830,8 +832,10 @@ void Session::set_pause(bool pause_) void Session::wait() { - session_thread->join(); - delete session_thread; + if (session_thread) { + session_thread->join(); + delete session_thread; + } session_thread = NULL; } |