[rkward-cvs] SF.net SVN: rkward:[3263] trunk/rkward/rkward/rbackend/rkrbackend.cpp

[tfry at users.sourceforge.net]

Revision: 3263
          http://rkward.svn.sourceforge.net/rkward/?rev=3263&view=rev
Author:   tfry
Date:     2010-12-17 12:46:34 +0000 (Fri, 17 Dec 2010)

Log Message:
-----------
Fix (most) crashes on exit.

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

Modified: trunk/rkward/rkward/rbackend/rkrbackend.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkrbackend.cpp	2010-12-17 12:30:14 UTC (rev 3262)
+++ trunk/rkward/rkward/rbackend/rkrbackend.cpp	2010-12-17 12:46:34 UTC (rev 3263)
@@ -581,6 +581,7 @@
 int RAskYesNoCancel (const char* message) {
 	RK_TRACE (RBACKEND);
 
+	if (RKRBackend::this_pointer->killed) return -1;	// HACK: At this point R asks whether to save the workspace. We have already handled that. So return -1 for "no"
 	return doDialogHelper (i18n ("Question from the R backend"), message, "yes", "no", "cancel", true);
 }
 
@@ -1167,7 +1168,7 @@
 	RBackendRequest request (true, RBackendRequest::HistoricalSubstackRequest);
 	request.params["call"] = list;
 	handleRequest (&request);
-}                                                                        
+}
 
 void RKRBackend::initialize () {
 	RK_TRACE (RBACKEND);


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