Changeset 840 for mcbuilder/trunk/src/MainWindow.cpp

Timestamp:

08/19/08 11:00:04 (5 months ago)

Author:

liamstask

Message:

- make sure config file is compared/loaded at the appropriate moment
- adjust Builder and MainWindow? to reflect changes

Files:

• mcbuilder/trunk/src/MainWindow.cpp (modified) (2 diffs)

mcbuilder/trunk/src/MainWindow.cpp

@@ -528 +528 @@
     setWindowTitle( projectName + "[*] - mcbuilder");
     updateRecentProjects(projectPath);
-    if(projInfo->diffProjects(projectPath))
+    // diff projects before loading the new one in
+    bool clean = projInfo->diffProjects(projectPath);
+    projInfo->load(projectPath); // but load the new one in before we clean, so the proper config and Makefiles are created
+    if(clean)
       builder->clean(projectPath);
-    projInfo->load();
     buildLog->clear();
   }
@@ -778 +780 @@
   if(currentProject.isEmpty())
     return statusBar()->showMessage( tr("Open a project first, or create a new one from the File menu."), 3500 );
-  if( !projInfo->loadAndShow() )
+  if( !projInfo->load(currentProject) )
   {
     QDir dir(currentProject);
     return statusBar()->showMessage( tr("Couldn't find/open project properties for ") + dir.dirName(), 3500 );
   }
+  else
+    projInfo->show();
 }