diff options
| author | fireice-uk <fireice-uk@users.noreply.github.com> | 2017-11-17 16:48:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 16:48:28 +0000 |
| commit | f50fa7d84d6cca05d0684c6f018ad5928301eafe (patch) | |
| tree | 578a9bcc5e00126965ff1fafa8fd759d3d869748 | |
| parent | 629542ae4d9686315fae4f8acfef42401710834a (diff) | |
| parent | 1d19b5d4260d911973bbc289a31f84c7d695bd07 (diff) | |
| download | xmr-stak-f50fa7d84d6cca05d0684c6f018ad5928301eafe.zip xmr-stak-f50fa7d84d6cca05d0684c6f018ad5928301eafe.tar.gz | |
Merge pull request #134 from fireice-uk/fix-wrong-gpu-res-crash
Fix GPU result crash
| -rw-r--r-- | xmrstak/misc/executor.cpp | 2 | ||||
| -rw-r--r-- | xmrstak/net/msgstruct.hpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp index 1af51fc..cccfca7 100644 --- a/xmrstak/misc/executor.cpp +++ b/xmrstak/misc/executor.cpp @@ -561,7 +561,7 @@ void executor::ex_main() break; case EV_GPU_RES_ERROR: - log_result_error(ev.oGpuError.error_str); + log_result_error(std::string(ev.oGpuError.error_str)); break; case EV_PERF_TICK: diff --git a/xmrstak/net/msgstruct.hpp b/xmrstak/net/msgstruct.hpp index a15f806..79541a1 100644 --- a/xmrstak/net/msgstruct.hpp +++ b/xmrstak/net/msgstruct.hpp @@ -125,6 +125,8 @@ struct ex_event case EV_POOL_HAVE_JOB: oPoolJob = from.oPoolJob; break; + case EV_GPU_RES_ERROR: + oGpuError = from.oGpuError; default: break; } @@ -152,6 +154,8 @@ struct ex_event case EV_POOL_HAVE_JOB: oPoolJob = from.oPoolJob; break; + case EV_GPU_RES_ERROR: + oGpuError = from.oGpuError; default: break; } |
