diff options
Diffstat (limited to 'src/thread_morphos.cpp')
| -rw-r--r-- | src/thread_morphos.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/thread_morphos.cpp b/src/thread_morphos.cpp index ef074da45..fcf459d04 100644 --- a/src/thread_morphos.cpp +++ b/src/thread_morphos.cpp @@ -153,7 +153,7 @@ public: if (NewGetTaskAttrs(NULL, &msg, sizeof(struct OTTDThreadStartupMessage *), TASKINFOTYPE_STARTUPMSG, TAG_DONE) && msg != NULL) { /* For now we terminate by throwing an error, gives much cleaner cleanup */ - throw 0; + throw OTTDThreadExitSignal(); } return true; @@ -203,8 +203,10 @@ private: if (NewGetTaskAttrs(NULL, &msg, sizeof(struct OTTDThreadStartupMessage *), TASKINFOTYPE_STARTUPMSG, TAG_DONE) && msg != NULL) { try { msg->func(msg->arg); - } catch(...) { + } catch(OTTDThreadExitSignal e) { KPutStr("[Child] Returned to main()\n"); + } catch(...) { + NOT_REACHED(); } } |