[rkward-cvs] SF.net SVN: rkward: [2159] branches/KDE4_port/rkward/rbackend

[tfry at users.sourceforge.net]

Revision: 2159
          http://rkward.svn.sourceforge.net/rkward/?rev=2159&view=rev
Author:   tfry
Date:     2007-11-02 05:03:14 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
Fix to last commit

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

Modified: branches/KDE4_port/rkward/rbackend/rinterface.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rinterface.cpp	2007-11-02 11:54:56 UTC (rev 2158)
+++ branches/KDE4_port/rkward/rbackend/rinterface.cpp	2007-11-02 12:03:14 UTC (rev 2159)
@@ -193,6 +193,7 @@
 		processRCallbackRequest (static_cast<RCallbackArgs *> (static_cast<QCustomEvent*> (e)->data ()));
 	} else if ((e->type () == RSTARTED_EVENT)) {
 		r_thread->unlock (RThread::Startup);
+		RKWardMainWindow::discardStartupOptions ();
 	} else if ((e->type () > RSTARTUP_ERROR_EVENT)) {
 		int err = e->type () - RSTARTUP_ERROR_EVENT;
 		QString message = i18n ("There was a problem starting the R backend. The following error(s) occurred:\n");

Modified: branches/KDE4_port/rkward/rbackend/rthread.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rthread.cpp	2007-11-02 11:54:56 UTC (rev 2158)
+++ branches/KDE4_port/rkward/rbackend/rthread.cpp	2007-11-02 12:03:14 UTC (rev 2159)
@@ -539,8 +539,6 @@
 	flushOutput ();
 	MUTEX_UNLOCK;
 
-	RKWardMainWindow::discardStartupOptions ();
-
 	return status;
 }
 


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