[rkward-cvs] SF.net SVN: rkward-code:[4638] branches/development_branches/ rkward_graphpics_device/rkward/rbackend/rkrbackend.cpp

[tfry at users.sf.net]

Revision: 4638
          http://sourceforge.net/p/rkward/code/4638
Author:   tfry
Date:     2013-03-28 17:19:55 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
Side-fix: User command can only fail, if there _is_ a user command. Relevant if there are several errors during command interruption.

Modified Paths:
--------------
    branches/development_branches/rkward_graphpics_device/rkward/rbackend/rkrbackend.cpp

Modified: branches/development_branches/rkward_graphpics_device/rkward/rbackend/rkrbackend.cpp
===================================================================
--- branches/development_branches/rkward_graphpics_device/rkward/rbackend/rkrbackend.cpp	2013-03-28 08:35:22 UTC (rev 4637)
+++ branches/development_branches/rkward_graphpics_device/rkward/rbackend/rkrbackend.cpp	2013-03-28 17:19:55 UTC (rev 4638)
@@ -879,7 +879,7 @@
 SEXP doError (SEXP call) {
 	RK_TRACE (RBACKEND);
 
-	if ((RKRBackend::repl_status.eval_depth == 0) && (!RKRBackend::repl_status.browser_context) && (!RKRBackend::this_pointer->isKilled ()) && (RKRBackend::repl_status.user_command_status != RKRBackend::RKReplStatus::ReplIterationKilled)) {
+	if ((RKRBackend::repl_status.eval_depth == 0) && (!RKRBackend::repl_status.browser_context) && (!RKRBackend::this_pointer->isKilled ()) && (RKRBackend::repl_status.user_command_status != RKRBackend::RKReplStatus::ReplIterationKilled) && (!RKRBackend::repl_status.user_command_status == RKRBackend::RKReplStatus::NoUserCommand)) {
 		RKRBackend::repl_status.user_command_status = RKRBackend::RKReplStatus::UserCommandFailed;
 	}
 	if (RKRBackend::repl_status.interrupted) {