patch #3354 by John Donovan

borysiasty · borysiasty · commit ff3cc6376956 · 2011-03-09T13:16:41.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15401 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5029,7 +5029,7 @@ bool QgisApp::saveDirty()
   QSettings settings;
   bool askThem = settings.value( "qgis/askToSaveProjectChanges", true ).toBool();
 
-  if ( askThem && ( QgsProject::instance()->isDirty() || mMapCanvas->isDirty() ) && mMapCanvas->layerCount() > 0 )
+  if ( askThem && ( QgsProject::instance()->isDirty() || mMapCanvas->isDirty() ) && QgsMapLayerRegistry::instance()->count() > 0 )
   {
     // flag project as dirty since dirty state of canvas is reset if "dirty"
     // is based on a zoom or pan

Original file line number	Diff line number	Diff line change
`@@ -5029,7 +5029,7 @@ bool QgisApp::saveDirty()`
`5029`	`5029`	`QSettings settings;`
`5030`	`5030`	`bool askThem = settings.value( "qgis/askToSaveProjectChanges", true ).toBool();`
`5031`	`5031`
`5032`		`- if ( askThem && ( QgsProject::instance()->isDirty() \|\| mMapCanvas->isDirty() ) && mMapCanvas->layerCount() > 0 )`
	`5032`	`+ if ( askThem && ( QgsProject::instance()->isDirty() \|\| mMapCanvas->isDirty() ) && QgsMapLayerRegistry::instance()->count() > 0 )`
`5033`	`5033`	`{`
`5034`	`5034`	`// flag project as dirty since dirty state of canvas is reset if "dirty"`
`5035`	`5035`	`// is based on a zoom or pan`