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

[tfry at users.sourceforge.net]

Revision: 2138
          http://rkward.svn.sourceforge.net/rkward/?rev=2138&view=rev
Author:   tfry
Date:     2007-10-28 11:27:39 -0700 (Sun, 28 Oct 2007)

Log Message:
-----------
Fix (some?) crashes on close

Modified Paths:
--------------
    branches/KDE4_port/rkward/agents/rkquitagent.cpp
    branches/KDE4_port/rkward/rkward.cpp

Modified: branches/KDE4_port/rkward/agents/rkquitagent.cpp
===================================================================
--- branches/KDE4_port/rkward/agents/rkquitagent.cpp	2007-10-28 18:17:36 UTC (rev 2137)
+++ branches/KDE4_port/rkward/agents/rkquitagent.cpp	2007-10-28 18:27:39 UTC (rev 2138)
@@ -35,7 +35,7 @@
 	RK_TRACE (APP);
 
 	quitting = true;
-	RCommand *command = new RCommand (QString::null, RCommand::EmptyCommand | RCommand::QuitCommand, QString::null, this);
+	RCommand *command = new RCommand (QString (), RCommand::EmptyCommand | RCommand::QuitCommand, QString (), this);
 
 	RKWardMainWindow::getMain ()->hide ();
 	cancel_dialog = new RKProgressControl (this, i18n ("Waiting for remaining R commands to finish. To quit immediately, press Cancel (WARNING: This may result in loss of data)"), i18n ("Waiting for R to finish"), RKProgressControl::AllowCancel | RKProgressControl::ShowAtOnce);

Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp	2007-10-28 18:17:36 UTC (rev 2137)
+++ branches/KDE4_port/rkward/rkward.cpp	2007-10-28 18:27:39 UTC (rev 2138)
@@ -190,7 +190,7 @@
 
 	if (doQueryQuit ()) {
 		emit (aboutToQuitRKWard());
-		e->accept ();
+		e->ignore ();
 		new RKQuitAgent (this);
 	} else {
 		e->ignore ();


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