diff --git a/vm/errors.cpp b/vm/errors.cpp index 154237a8f2..8372edf0d2 100755 --- a/vm/errors.cpp +++ b/vm/errors.cpp @@ -165,7 +165,7 @@ void factorvm::memory_signal_handler_impl() void memory_signal_handler_impl() { - SIGNAL_VM_PTR()->misc_signal_handler_impl(); + SIGNAL_VM_PTR()->memory_signal_handler_impl(); } void factorvm::misc_signal_handler_impl() diff --git a/vm/factor.cpp b/vm/factor.cpp index 026453eae3..741800f8d1 100755 --- a/vm/factor.cpp +++ b/vm/factor.cpp @@ -52,7 +52,11 @@ void factorvm::default_parameters(vm_parameters *p) #ifdef WINDOWS p->console = false; #else - p->console = true; + if (this == vm) + p->console = true; + else + p->console = false; + #endif p->stack_traces = true; diff --git a/vm/main-unix.cpp b/vm/main-unix.cpp index bd1549a38e..bc605e3cfd 100644 --- a/vm/main-unix.cpp +++ b/vm/main-unix.cpp @@ -2,11 +2,6 @@ int main(int argc, char **argv) { - #ifdef FACTOR_MULTITHREADED - factor::THREADHANDLE thread = factor::start_standalone_factor_in_new_thread(argc,argv); - pthread_join(thread,NULL); - #else - factor::start_standalone_factor(argc,argv); - #endif + factor::start_standalone_factor(argc,argv); return 0; }