[Kst] branches/work/kst/portto4/kst/src

[Adam Treat]

SVN commit 642848 by treat:

* No more crashing on close


 M  +2 -6      kst/main.cpp  
 M  +5 -5      libkstapp/kst.cpp  
 M  +2 -1      widgets/vectorselector.cpp  


--- branches/work/kst/portto4/kst/src/kst/main.cpp #642847:642848
@@ -797,9 +797,8 @@
       delete kst;
       return 0;
     } else {
-//FIXME PORT!
-//       kst->updateDialogs();
-      
+      kst->updateDialogs();
+
       if (showQuickStart) {
         kst->showQuickStartDialog();
       }
@@ -811,10 +810,7 @@
       }
       startupErrors.clear();
     }
-
-    // LEAVE THIS HERE - causes crashes otherwise!
     int rc = app.exec();
-    delete kst;
     return rc;
   }
 
--- branches/work/kst/portto4/kst/src/libkstapp/kst.cpp #642847:642848
@@ -2014,7 +2014,7 @@
 
 
 void KstApp::showViewFitsDialog() {
-  viewFitsDialog->showViewFitsDialog();
+/*  viewFitsDialog->showViewFitsDialog();*/
 }
 
 
@@ -2085,7 +2085,7 @@
   ViewStringsDialogAction->setEnabled(viewStringsDialog->hasContent());
   ViewVectorsDialogAction->setEnabled(viewVectorsDialog->hasContent());
   ViewMatricesDialogAction->setEnabled(viewMatricesDialog->hasContent());
-  ViewFitsDialogAction->setEnabled(viewFitsDialog->hasContent());
+//   ViewFitsDialogAction->setEnabled(viewFitsDialog->hasContent());
 
   if (!viewScalarsDialog->isHidden()) {
     viewScalarsDialog->updateViewScalarsDialog();
@@ -2099,9 +2099,9 @@
   if (!viewMatricesDialog->isHidden()) {
     viewMatricesDialog->updateViewMatricesDialog();
   }
-  if (!viewFitsDialog->isHidden()) {
-    viewFitsDialog->updateViewFitsDialog();
-  }
+//   if (!viewFitsDialog->isHidden()) {
+//     viewFitsDialog->updateViewFitsDialog();
+//   }
 
   if (dm) {
     dataManager->updateContents();
--- branches/work/kst/portto4/kst/src/widgets/vectorselector.cpp #642847:642848
@@ -102,7 +102,8 @@
     _vector->setItemText(_vector->currentIndex(), prev);
   }
   blockSignals(false);
-  setEdit(_vector->currentText());
+//FIXME PORT!
+//   setEdit(_vector->currentText());
 }