From 56635c1fcf0d6fd2d13c4f0403fa1e0e0e9a6d22 Mon Sep 17 00:00:00 2001 From: Dave French Date: Wed, 28 Jan 2015 06:35:52 +0000 Subject: [PATCH 1/2] Proposed fix for 1695 Cannot save templates --- src/gui/MainWindow.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index cccc7bd39..b40674551 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -830,8 +830,13 @@ bool MainWindow::saveProjectAs() if( sfd.exec () == FileDialog::Accepted && !sfd.selectedFiles().isEmpty() && sfd.selectedFiles()[0] != "" ) { + QString fname = sfd.selectedFiles()[0] ; + if( sfd.selectedNameFilter().contains( "(*.mpt)" ) ) + { + fname += ".mpt"; + } Engine::getSong()->guiSaveProjectAs( - sfd.selectedFiles()[0] ); + fname ); return( true ); } return( false ); From efa75b0151377e8ce6d13d5bdb79cbff86236c7f Mon Sep 17 00:00:00 2001 From: Dave French Date: Thu, 29 Jan 2015 10:38:19 +0000 Subject: [PATCH 2/2] Checks for .mpt extension, before adding extension when saving project templates --- src/gui/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index b40674551..b8ddd6071 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -831,7 +831,7 @@ bool MainWindow::saveProjectAs() !sfd.selectedFiles().isEmpty() && sfd.selectedFiles()[0] != "" ) { QString fname = sfd.selectedFiles()[0] ; - if( sfd.selectedNameFilter().contains( "(*.mpt)" ) ) + if( sfd.selectedNameFilter().contains( "(*.mpt)" ) && !sfd.selectedFiles()[0].endsWith( ".mpt" ) ) { fname += ".mpt"; }