Merge pull request #1305 from manisandro/save_on_new_from_template

Ask whether to save existing project when creating a new project from a template
qgis · Apr 10, 2014 · a1f1b94 · a1f1b94
2 parents 5f19830 + 25915d7
commit a1f1b94
Showing 1 changed file with 6 additions and 0 deletions.
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
+