fixed stupid signal handler bug

diff --git a/vm/errors.cpp b/vm/errors.cpp
index 154237a8f2cb35606dd1914a0eadcbbe1e787fb5..8372edf0d2fc53c6b2c1f1b872693e61447d816f 100755 (executable)
--- 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 026453eae344a89b42f7139558dfb9846b3d00f7..741800f8d18438c86c940761dc8921f1b5f17fd9 100755 (executable)
--- 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 bd1549a38ebb8656b868c5fa30683173c6d443a8..bc605e3cfdf4a4bd45f32bade4c53a10d50a80be 100644 (file)
--- 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;
 }