From 2d2f23de10103528cb64beef58ec0cdb277409ff Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 7 Jun 2018 08:54:47 +0200
Subject: [PATCH] Fix T55348: Renaming a marker can't cancel

Regression in a14005c070a1f
---
 source/blender/editors/interface/interface_templates.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index d934d4dd1e4..9978726fa74 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3970,7 +3970,9 @@ eAutoPropButsReturn uiTemplateOperatorPropertyButs(
 #endif
 
 	/* set various special settings for buttons */
-	{
+
+	/* Only do this if we're not refreshing an existing UI. */
+	if (block->oldblock == NULL) {
 		const bool is_popup = (block->flag & UI_BLOCK_KEEP_OPEN) != 0;
 		uiBut *but;