Merge pull request #1305 from manisandro/save_on_new_from_template

mhugent · mhugent · commit a1f1b94af4a3 · 2014-04-10T09:06:38.000+02:00
Ask whether to save existing project when creating a new project from a template
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3284,6 +3284,11 @@ void QgisApp::fileNew( bool thePromptToSaveFlag, bool forceBlank )
 
 bool QgisApp::fileNewFromTemplate( QString fileName )
 {
+  if ( !saveDirty() )
+  {
+    return false; //cancel pressed
+  }
+
   QgsDebugMsg( QString( "loading project template: %1" ).arg( fileName ) );
   if ( addProject( fileName ) )
   {
@@ -9560,3 +9565,4 @@ LONG WINAPI QgisApp::qgisCrashDump( struct _EXCEPTION_POINTERS *ExceptionInfo )
   return EXCEPTION_EXECUTE_HANDLER;
 }
 #endif
+

Original file line number	Diff line number	Diff line change
`@@ -3284,6 +3284,11 @@ void QgisApp::fileNew( bool thePromptToSaveFlag, bool forceBlank )`
`3284`	`3284`
`3285`	`3285`	`bool QgisApp::fileNewFromTemplate( QString fileName )`
`3286`	`3286`	`{`
	`3287`	`+ if ( !saveDirty() )`
	`3288`	`+ {`
	`3289`	`+ return false; //cancel pressed`
	`3290`	`+ }`
	`3291`	`+`
`3287`	`3292`	`QgsDebugMsg( QString( "loading project template: %1" ).arg( fileName ) );`
`3288`	`3293`	`if ( addProject( fileName ) )`
`3289`	`3294`	`{`
`@@ -9560,3 +9565,4 @@ LONG WINAPI QgisApp::qgisCrashDump( struct _EXCEPTION_POINTERS *ExceptionInfo )`
`9560`	`9565`	`return EXCEPTION_EXECUTE_HANDLER;`
`9561`	`9566`	`}`
`9562`	`9567`	`#endif`
	`9568`	`+`