diff options
| author | iain holmes <iain@xamarin.com> | 2017-03-16 19:39:56 +0300 |
|---|---|---|
| committer | iain holmes <iain@xamarin.com> | 2017-03-16 19:39:56 +0300 |
| commit | 160024a97d0c7783302b82f8cc64778882016fbe (patch) | |
| tree | 80514d92665b686dccb9cb714d1d3213581a5631 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects | |
| parent | d299b02f484b6acaeca9e9ef60923105d88b9b81 (diff) | |
| parent | b4c75c942570caad8ef060d04fcda1ee1417b701 (diff) | |
Merge remote-tracking branch 'upstream/master' into a11y
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs | 2 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs index c30bde89f6..544c574999 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs @@ -213,7 +213,7 @@ namespace MonoDevelop.Ide.Projects void TemplatesTreeViewSelectionChanged (object sender, EventArgs e)
{
controller.SelectedTemplate = GetSelectedTemplate ();
- if (templateTextRenderer.RenderRecentTemplate) {
+ if (templateTextRenderer.RenderRecentTemplate && controller.SelectedTemplate != null) {
// reset selected language if a recent template has been selected
templateTextRenderer.SelectedLanguage = controller.SelectedTemplate.Language;
controller.SelectedLanguage = controller.SelectedTemplate.Language;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs index 41a7c7c4ea..c277db2a9b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs @@ -573,7 +573,7 @@ namespace MonoDevelop.Ide.Projects if (wizardProvider.HasWizard)
wizardProvider.BeforeProjectIsCreated ();
- if (!CreateProject ())
+ if (!await CreateProject ())
return;
Solution parentSolution = null;
@@ -679,7 +679,7 @@ namespace MonoDevelop.Ide.Projects .ToList ();
}
- bool CreateProject ()
+ async Task<bool> CreateProject ()
{
if (!projectConfiguration.IsValid ()) {
MessageService.ShowError (projectConfiguration.GetErrorMessage ());
@@ -724,7 +724,7 @@ namespace MonoDevelop.Ide.Projects DisposeExistingNewItems ();
try {
- result = IdeApp.Services.TemplatingService.ProcessTemplate (template, projectConfiguration, ParentFolder);
+ result = await IdeApp.Services.TemplatingService.ProcessTemplate (template, projectConfiguration, ParentFolder);
if (!result.WorkspaceItems.Any ())
return false;
} catch (UserException ex) {
|