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

[tfry at users.sourceforge.net]

Revision: 2744
          http://rkward.svn.sourceforge.net/rkward/?rev=2744&view=rev
Author:   tfry
Date:     2010-02-14 19:20:50 +0000 (Sun, 14 Feb 2010)

Log Message:
-----------
Fix some initialization bugs. Still seeing crashes during automated testing, though.

Modified Paths:
--------------
    trunk/rkward/rkward/scriptbackends/qtscriptbackend.cpp
    trunk/rkward/rkward/scriptbackends/scriptbackend.cpp

Modified: trunk/rkward/rkward/scriptbackends/qtscriptbackend.cpp
===================================================================
--- trunk/rkward/rkward/scriptbackends/qtscriptbackend.cpp	2010-02-14 19:10:59 UTC (rev 2743)
+++ trunk/rkward/rkward/scriptbackends/qtscriptbackend.cpp	2010-02-14 19:20:50 UTC (rev 2744)
@@ -39,6 +39,7 @@
 QtScriptBackend::~QtScriptBackend () {
 	RK_TRACE (PHP);
 
+	destroy ();
 	if (script_thread && script_thread->isRunning ()) script_thread->terminate ();
 }
 
@@ -70,6 +71,7 @@
 	RK_TRACE (PHP);
 	if (!dead) {
 		dead = true;
+		code_property = 0;
 		if (script_thread) script_thread->kill ();
 		QTimer::singleShot (10000, this, SLOT (deleteLater()));	// don't wait for ever for the process to die, even if it's somewhat dangerous
 	}

Modified: trunk/rkward/rkward/scriptbackends/scriptbackend.cpp
===================================================================
--- trunk/rkward/rkward/scriptbackends/scriptbackend.cpp	2010-02-14 19:10:59 UTC (rev 2743)
+++ trunk/rkward/rkward/scriptbackends/scriptbackend.cpp	2010-02-14 19:20:50 UTC (rev 2744)
@@ -24,6 +24,8 @@
 
 ScriptBackend::ScriptBackend () : QObject() {
 	busy = false;
+	current_type = Ignore;
+	code_property = 0;
 }
 
 ScriptBackend::~ScriptBackend () {


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