[rkward-cvs] SF.net SVN: rkward: [1210] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 1210
          http://svn.sourceforge.net/rkward/?rev=1210&view=rev
Author:   tfry
Date:     2007-01-24 09:50:01 -0800 (Wed, 24 Jan 2007)

Log Message:
-----------
Small corrections

Modified Paths:
--------------
    trunk/rkward/rkward/plugin/rkstandardcomponent.cpp
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R

Modified: trunk/rkward/rkward/plugin/rkstandardcomponent.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkstandardcomponent.cpp	2007-01-24 17:27:16 UTC (rev 1209)
+++ trunk/rkward/rkward/plugin/rkstandardcomponent.cpp	2007-01-24 17:50:01 UTC (rev 1210)
@@ -140,7 +140,7 @@
 RKStandardComponent::~RKStandardComponent () {
 	RK_TRACE (PLUGIN);
 
-	gui->deleteLater ();
+	if (gui) gui->deleteLater ();
 	delete backend;
 }
 

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R	2007-01-24 17:27:16 UTC (rev 1209)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R	2007-01-24 17:50:01 UTC (rev 1210)
@@ -341,12 +341,15 @@
 ".rk.preview.devices" <- list ();
 
 ".rk.startPreviewDevice" <- function (x) {
-	if (is.null (.rk.preview.devices[[x]])) {
+	a <- .rk.preview.devices[[x]]
+	if (is.null (a)) {
 		a <- dev.cur ()
 		x11 ()
 		if (a != dev.cur ()) {
 			.rk.preview.devices[[x]] <<- dev.cur ()
 		}
+	} else {
+		dev.set (a)
 	}
 }
 


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