fix #6225

etiennesky · etiennesky · commit 4b7be2a88e10 · 2012-08-27T19:25:30.000-03:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2509,6 +2509,12 @@ bool QgisApp::askUserForZipItemLayers( QString path )
     }
   }
 
+  if ( childItems.isEmpty() )
+  {
+    // return true so dialog doesn't popup again (#6225) - hopefully this doesn't create other trouble
+    ok = true;
+  }
+  
   // add childItems
   foreach ( QgsDataItem* item, childItems )
   {

Original file line number	Diff line number	Diff line change
`@@ -2509,6 +2509,12 @@ bool QgisApp::askUserForZipItemLayers( QString path )`
`2509`	`2509`	`}`
`2510`	`2510`	`}`
`2511`	`2511`
	`2512`	`+ if ( childItems.isEmpty() )`
	`2513`	`+ {`
	`2514`	`+ // return true so dialog doesn't popup again (#6225) - hopefully this doesn't create other trouble`
	`2515`	`+ ok = true;`
	`2516`	`+ }`
	`2517`	`+`
`2512`	`2518`	`// add childItems`
`2513`	`2519`	`foreach ( QgsDataItem* item, childItems )`
`2514`	`2520`	`{`