===================================================================

RCS file: /cvsroot/qgis/qgis/ChangeLog,v
retrieving revision 1.175
diff -r1.175 ChangeLog
5a6,19
> 2004-08-26 [mcoletti] 0.4.0devel22
> qgisapp.cpp:
>
>  - fixed bug 1017079, where loading projects would cause app to crash
>
> qgsprojectio.cpp:
>
>  - minor code change; commented out superfluous code
>
> 2004-08-26 [mcoletti] 0.4.0devel21
> Now explicitly check for command line arguments via $# instead of $@.  Using
> $@ caused the script to crash when more than one command line argument was
> passed in.  (E.g., specifying multiple files for CVS commits.)
>
Index: configure.in
===================================================================
RCS file: /cvsroot/qgis/qgis/configure.in,v
retrieving revision 1.177
diff -r1.177 configure.in
29c29
< EXTRA_VERSION=20
---
> EXTRA_VERSION=22


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1940 c8812cc2-4d05-0410-92ff-de0c093fc19c

ChangeLog

@@ -1,8 +1,22 @@
 QGIS Change Log
-ChangeLog,v 1.175 2004/08/26 16:48:24 mcoletti Exp
+ChangeLog,v 1.176 2004/08/26 18:57:27 mcoletti Exp
 ------------------------------------------------------------------------------
 Version 0.4 'Baby' .... development version
 
+2004-08-26 [mcoletti] 0.4.0devel22
+qgisapp.cpp:
+
+ - fixed bug 1017079, where loading projects would cause app to crash
+
+qgsprojectio.cpp:
+
+ - minor code change; commented out superfluous code
+
+2004-08-26 [mcoletti] 0.4.0devel21
+Now explicitly check for command line arguments via $# instead of $@.  Using
+$@ caused the script to crash when more than one command line argument was
+passed in.  (E.g., specifying multiple files for CVS commits.)
+
 2004-08-25 [mcoletti] 0.4.0devel20
 Now explicitly use QgsMapLayerRegistry instance instead of data members.  (Of
 which two both referred to the same instance.)

configure.in

@@ -1,6 +1,6 @@
 
 dnl Process this file with autoconf to produce a configure script.
-dnl configure.in,v 1.177 2004/08/26 16:48:24 mcoletti Exp
+dnl configure.in,v 1.178 2004/08/26 18:57:27 mcoletti Exp
 
 
 
@@ -26,7 +26,7 @@ dnl ---------------------------------------------------------------------------
 MAJOR_VERSION=0
 MINOR_VERSION=4
 MICRO_VERSION=0
-EXTRA_VERSION=20
+EXTRA_VERSION=22
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
 else

src/qgisapp.cpp

@@ -1203,6 +1203,10 @@ void QgisApp::fileOpen()
     // loading a project will add all layers to the registry and return the
     // zorder for those layers.
 
+    // clear the map canvas
+    removeAllLayers(); // moved here from following if since this would stomp
+                       // on all layers read from pio
+
     std::list<QString> myZOrder = pio->read();
 
     if( ! myZOrder.empty() )
@@ -1210,10 +1214,6 @@ void QgisApp::fileOpen()
         mOverviewCanvas->freeze(true);
         mMapCanvas->freeze(true);
 
-        // clear the map canvas
-        removeAllLayers();
-
-        
         QgsRect myExtent = mMapCanvas->extent();
 
 #ifdef QGISDEBUG
@@ -1250,6 +1250,7 @@ void QgisApp::fileOpen()
         setOverviewZOrder(mMapLegend);
         // delete pio; auto_ptr automatically deletes
         mMapCanvas->setExtent(myExtent);
+
         mMapCanvas->refresh();
         mOverviewCanvas->freeze(false);
         mMapCanvas->freeze(false);

src/qgsprojectio.cpp

@@ -12,7 +12,7 @@ email                : sherman at mrcc.com
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/* qgsprojectio.cpp,v 1.50 2004/08/15 00:52:47 gsherman Exp */
+/* qgsprojectio.cpp,v 1.51 2004/08/26 18:57:37 mcoletti Exp */
 #include <iostream>
 #include <fstream>
 #include <qfiledialog.h>
@@ -98,7 +98,9 @@ std::list<QString> QgsProjectIo::read(QString path)
   // it will be the same registry data as used by the map canvas)
   QgsMapLayerRegistry * myMapLayerRegistry = QgsMapLayerRegistry::instance();
   std::list<QString> myZOrder;
-  myZOrder.clear();
+
+  // myZOrder.clear(); should be empty by default
+
   if(path.isNull())
   {
     // no project file selected - get one using a QFileDialog