[rkward-cvs] SF.net SVN: rkward: [2149] branches/release_branch_0.4.8

[tfry at users.sourceforge.net]

Revision: 2149
          http://rkward.svn.sourceforge.net/rkward/?rev=2149&view=rev
Author:   tfry
Date:     2007-10-30 08:38:21 -0700 (Tue, 30 Oct 2007)

Log Message:
-----------
Merge 2148 from trunk

Modified Paths:
--------------
    branches/release_branch_0.4.8/ChangeLog
    branches/release_branch_0.4.8/rkward/rkconsole.cpp

Modified: branches/release_branch_0.4.8/ChangeLog
===================================================================
--- branches/release_branch_0.4.8/ChangeLog	2007-10-30 15:36:54 UTC (rev 2148)
+++ branches/release_branch_0.4.8/ChangeLog	2007-10-30 15:38:21 UTC (rev 2149)
@@ -1,3 +1,4 @@
+- Fixed: Console accepted pasted input while a command is running
 - Fixed: Analysis->Moments->Moment plugin did not use the order-parameter
 - Fixed: Crash on simple assignments in globalenv() with R < 2.4.0
 - Fixed: Meta information (labels) did not get shown correctly in the data editor

Modified: branches/release_branch_0.4.8/rkward/rkconsole.cpp
===================================================================
--- branches/release_branch_0.4.8/rkward/rkconsole.cpp	2007-10-30 15:36:54 UTC (rev 2148)
+++ branches/release_branch_0.4.8/rkward/rkconsole.cpp	2007-10-30 15:38:21 UTC (rev 2149)
@@ -616,6 +616,8 @@
 
 void RKConsole::submitBatch (const QString &batch) {
 	RK_TRACE (APP);
+
+	if (current_command) return;
 	// splitting batch, not allowing empty entries.
 	// TODO: hack something so we can have empty entries.
 	commands_batch = QStringList::split ("\n", batch, true);


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