[rkward-cvs] SF.net SVN: rkward: [1916] trunk/rkward/rkward/rbackend/rinterface.cpp

[tfry at users.sourceforge.net]

Revision: 1916
          http://svn.sourceforge.net/rkward/?rev=1916&view=rev
Author:   tfry
Date:     2007-05-21 05:29:34 -0700 (Mon, 21 May 2007)

Log Message:
-----------
Cancelling the same running command could in fact happen

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

Modified: trunk/rkward/rkward/rbackend/rinterface.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rinterface.cpp	2007-05-20 13:05:30 UTC (rev 1915)
+++ trunk/rkward/rkward/rbackend/rinterface.cpp	2007-05-21 12:29:34 UTC (rev 1916)
@@ -246,10 +246,12 @@
 	if (!(command->type () & RCommand::Sync)) {
 		command->status |= RCommand::Canceled;
 		if (command == r_thread->current_command) {
-			RK_ASSERT (!running_command_canceled);
-			r_thread->lock (RThread::Cancel);
-			running_command_canceled = command;
-			r_thread->interruptProcessing (true);
+			if (running_command_canceled != command) {
+				RK_ASSERT (!running_command_canceled);
+				r_thread->lock (RThread::Cancel);
+				running_command_canceled = command;
+				r_thread->interruptProcessing (true);
+			}
 		}
 	} else {
 		RK_ASSERT (false);


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