diff options
| author | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
| commit | 13afb7e0bf35bacc9c90c7dffe34120ddd2fd099 (patch) | |
| tree | 180c739ac69aceab8ce4cc6151030539a32ac8c3 /src/common/thread.c | |
| parent | 1114eb3da58b078258a824424fef687a1ccee90c (diff) | |
| parent | 66979ef89363c03e3cc02d63feb5248836daff4e (diff) | |
| download | hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.gz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.bz2 hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.xz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Conflicts:
src/map/chrif.c
src/map/clif.c
src/map/homunculus.c
src/map/pet.c
src/map/script.c
src/map/skill.c
src/map/status.c
All clear.
Diffstat (limited to 'src/common/thread.c')
| -rw-r--r-- | src/common/thread.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/common/thread.c b/src/common/thread.c index 315b310b2..4d110f2dd 100644 --- a/src/common/thread.c +++ b/src/common/thread.c @@ -96,15 +96,11 @@ void rathread_final(){ // gets called whenever a thread terminated .. -static void rat_thread_terminated( rAthread handle ){ - - int id_backup = handle->myID; - - // Simply set all members to 0 (except the id) - memset(handle, 0x00, sizeof(struct rAthread)); - - handle->myID = id_backup; // done ;) - +static void rat_thread_terminated(rAthread handle) { + // Preserve handle->myID and handle->hThread, set everything else to its default value + handle->param = NULL; + handle->proc = NULL; + handle->prio = RAT_PRIO_NORMAL; }//end: rat_thread_terminated() #ifdef WIN32 |