[rkward-cvs] SF.net SVN: rkward: [2131] branches/KDE4_port/rkward/rbackend/rthread.cpp

[tfry at users.sourceforge.net]

Revision: 2131
          http://rkward.svn.sourceforge.net/rkward/?rev=2131&view=rev
Author:   tfry
Date:     2007-10-25 11:01:07 -0700 (Thu, 25 Oct 2007)

Log Message:
-----------
I should test before committing...

Modified Paths:
--------------
    branches/KDE4_port/rkward/rbackend/rthread.cpp

Modified: branches/KDE4_port/rkward/rbackend/rthread.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rthread.cpp	2007-10-25 17:56:58 UTC (rev 2130)
+++ branches/KDE4_port/rkward/rbackend/rthread.cpp	2007-10-25 18:01:07 UTC (rev 2131)
@@ -101,7 +101,6 @@
 	checkObjectUpdatesNeeded (true);
 	RCommandStack::regular_stack->pop ();	// remove the fake command
 	notifyCommandDone (current_command);
-	current_command = 0;
 	MUTEX_UNLOCK;
 
 	while (1) {
@@ -125,7 +124,6 @@
 				checkObjectUpdatesNeeded (current_command->type () & (RCommand::User | RCommand::ObjectListUpdate));
 				processX11Events ();
 				RCommandStack::regular_stack->pop ();
-				current_command = 0;
 				notifyCommandDone (current_command);	// command may be deleted after this
 			}
 		
@@ -264,6 +262,9 @@
 void RThread::notifyCommandDone (RCommand *command) {
 	RK_TRACE (RBACKEND);
 
+	RK_ASSERT (command == current_command);
+	current_command = 0;
+
 	// notify GUI-thread that command was finished
 	QCustomEvent* event = new QCustomEvent (RCOMMAND_OUT_EVENT);
 	event->setData (command);
@@ -430,7 +431,6 @@
 				if (object_update_forced) checkObjectUpdatesNeeded (true);
 				processX11Events ();
 				reply_stack->pop ();
-				current_command = 0;
 				notifyCommandDone (current_command);	// command may be deleted after this
 			}
 		}


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