From 97e9cd4be0013544042675a905fa438fc94331f0 Mon Sep 17 00:00:00 2001
From: Andy Rose <andy@cyberian.co.uk>
Date: Thu, 29 Oct 2015 13:54:12 +0000
Subject: [PATCH] U4-6980: Only assume a masterpage template if a MVC hasn't
 already been created

---
 .../Persistence/Repositories/TemplateRepository.cs          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
index 0a0dbe37dd..8d0d091621 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
@@ -682,14 +682,14 @@ namespace Umbraco.Core.Persistence.Repositories
         public RenderingEngine DetermineTemplateRenderingEngine(ITemplate template)
         {
             var engine = _templateConfig.DefaultRenderingEngine;
+            var viewHelper = new ViewHelper(_viewsFileSystem);
 
-            if (template.Content.IsNullOrWhiteSpace() == false && MasterPageHelper.IsMasterPageSyntax(template.Content))
+            if (template.Content.IsNullOrWhiteSpace() == false && MasterPageHelper.IsMasterPageSyntax(template.Content) && !viewHelper.ViewExists(template))
             {
-                //there is a design but its definitely a webforms design
+                //there is a design but its definitely a webforms design and we haven't got a MVC view already for it
                 return RenderingEngine.WebForms;
             }
 
-            var viewHelper = new ViewHelper(_viewsFileSystem);
             var masterPageHelper = new MasterPageHelper(_masterpagesFileSystem);
 
             switch (engine)