[rkward-cvs] SF.net SVN: rkward:[3198] trunk/rkward/rkward/rbackend/rkrbackend.cpp

[tfry at users.sourceforge.net]

Revision: 3198
          http://rkward.svn.sourceforge.net/rkward/?rev=3198&view=rev
Author:   tfry
Date:     2010-11-19 13:59:06 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
Fix stray '---interrupted---'-messages

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rkrbackend.cpp

Modified: trunk/rkward/rkward/rbackend/rkrbackend.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkrbackend.cpp	2010-11-19 13:06:38 UTC (rev 3197)
+++ trunk/rkward/rkward/rbackend/rkrbackend.cpp	2010-11-19 13:59:06 UTC (rev 3198)
@@ -714,7 +714,7 @@
 SEXP doError (SEXP call) {
 	RK_TRACE (RBACKEND);
 
-	if ((RKRBackend::repl_status.eval_depth == 0) && (!RKRBackend::repl_status.in_browser_context) && (!RKRBackend::this_pointer->isKilled ())) {
+	if ((RKRBackend::repl_status.eval_depth == 0) && (!RKRBackend::repl_status.in_browser_context) && (!RKRBackend::this_pointer->isKilled ()) && (RKRBackend::repl_status.user_command_status != RKRBackend::RKReplStatus::ReplIterationKilled)) {
 		RKRBackend::repl_status.user_command_status = RKRBackend::RKReplStatus::UserCommandFailed;
 	}
 	if (RKRBackend::repl_status.interrupted) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.