[rkward-cvs] SF.net SVN: rkward: [2326] trunk/rkward/rkward/windows/rcontrolwindow.cpp

[tfry at users.sourceforge.net]

Revision: 2326
          http://rkward.svn.sourceforge.net/rkward/?rev=2326&view=rev
Author:   tfry
Date:     2008-01-17 12:01:38 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
Only remove listener, if previously added (silences assertion failure on exit)

Modified Paths:
--------------
    trunk/rkward/rkward/windows/rcontrolwindow.cpp

Modified: trunk/rkward/rkward/windows/rcontrolwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rcontrolwindow.cpp	2008-01-17 11:54:03 UTC (rev 2325)
+++ trunk/rkward/rkward/windows/rcontrolwindow.cpp	2008-01-17 20:01:38 UTC (rev 2326)
@@ -76,8 +76,10 @@
 RControlWindow::~RControlWindow () {
 	RK_TRACE (APP);
 
-	commands_view->setModel (0);
-	RCommandStackModel::getModel ()->removeListener ();
+	if (commands_view->model ()) {
+		commands_view->setModel (0);
+		RCommandStackModel::getModel ()->removeListener ();
+	}
 }
 
 void RControlWindow::showEvent (QShowEvent *e) {


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