diff -r 008e72977ab8 -r edb78a44240b mainwindow.cpp --- a/mainwindow.cpp Thu Mar 26 07:50:32 2009 +0000 +++ b/mainwindow.cpp Tue Mar 31 15:36:10 2009 +0000 @@ -1,5 +1,6 @@ #include "mainwindow.h" +#include #include #include @@ -2564,7 +2565,7 @@ urls.at(i); #endif p->start ("dcop",args); - //cout << qPrintable (args.join(" "))<waitForStarted() ) success=false; } if (!success) @@ -3483,6 +3484,7 @@ void Main::changeSelection (VymModel *model, const QItemSelection &newsel, const QItemSelection &oldsel) { //branchPropertyWindow->setModel (model ); //FIXME-1 this used to be called from BranchObj::select() + if (model && model==currentModel() ) { // NoteEditor @@ -3811,8 +3813,8 @@ void Main::testFunction1() { - if (!currentMapEditor()) return; - currentMapEditor()->testFunction1(); + //if (!currentMapEditor()) return; + //currentMapEditor()->testFunction1(); //editAttribute(); }