X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FScriptingDock.cxx;h=6a3f76304997eaa45992380cbc40aafb38bde214;hp=b3545703d3962266fb0e8afa69b310053ff39c7e;hb=dba058b3ff87f818042a09bcfa8fc58072adc49b;hpb=0e21ee85aaa334476f73e0f3d5c6ab6b46859c99

diff --git a/src/gui/widgets/ScriptingDock.cxx b/src/gui/widgets/ScriptingDock.cxx
index b354570..6a3f763 100644
--- a/src/gui/widgets/ScriptingDock.cxx
+++ b/src/gui/widgets/ScriptingDock.cxx
@@ -1,15 +1,36 @@
 #include "ScriptingDock.hxx"
 
+namespace {
+    SCM handler (void *data, SCM tag, SCM throw_args) {
+        scm_handle_by_message_noexit ((void*)"foo", tag, throw_args);
+		return SCM_BOOL_F;
+	}
+}
+
 void ScriptingDock::doEvaluate() {
     QString text = line->text();
     line->clear();
     LOG4CXX_INFO(logger, "Evaluating String \"" << text.toStdString() << "\"");
     browser->append(QString("> ") + text);
     
-    SCM result_obj = scm_c_eval_string(text.toStdString().c_str());
+    SCM result_obj = scm_internal_catch(SCM_BOOL_T,
+										(SCM (*)(void *))scm_c_eval_string,
+										(void*)text.toStdString().c_str(),
+										handler, NULL);
     SCM result_str = scm_object_to_string(result_obj, SCM_UNDEFINED);
 
     SCM output = scm_get_output_string(guile_output_port);
-    browser->append(scm_to_locale_string(output));
+	QString output_q = scm_to_locale_string(output);
+	if (output_q.endsWith("\n")) output_q.chop(1);
+	if (output_q != "")	browser->append(output_q);
+
+	output =  scm_get_output_string(guile_error_port);
+	output_q = scm_to_locale_string(output);
+	if (output_q.endsWith("\n")) output_q.chop(1);
+	if (output_q != "")	browser->append(output_q);
+
+	scm_truncate_file(guile_output_port, scm_from_uint16(0));
+	scm_truncate_file(guile_error_port, scm_from_uint16(0));	
+			
     browser->append(scm_to_locale_string(result_str));
 }