[rkward-cvs] SF.net SVN: rkward:[3163] branches/2010_10_18_backend_restructuring_branch/ rkward/rbackend/rinterface.cpp

[tfry at users.sourceforge.net]

Revision: 3163
          http://rkward.svn.sourceforge.net/rkward/?rev=3163&view=rev
Author:   tfry
Date:     2010-10-28 19:32:08 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
Don't lock up on cancelled comamnds

Modified Paths:
--------------
    branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rinterface.cpp

Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rinterface.cpp
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rinterface.cpp	2010-10-28 16:59:18 UTC (rev 3162)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rinterface.cpp	2010-10-28 19:32:08 UTC (rev 3163)
@@ -219,7 +219,7 @@
 		}
 	#endif
 
-	if (command->status & RCommand::Canceled) {
+	if ((command->status & RCommand::Canceled) || (command == running_command_canceled)) {
 		command->status |= RCommand::HasError;
 		ROutput *out = new ROutput;
 		out->type = ROutput::Error;


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