From 82b8b30560812a898b73ecfa06263d716865b8a0 Mon Sep 17 00:00:00 2001
From: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Date: Sat, 13 Jun 2015 21:12:25 +0800
Subject: [PATCH] When extracting resources, always use the new data for
 generated comments/flags

Based on TortoiseSVN revision 26576

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
---
 src/ResText/POFile.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ResText/POFile.cpp b/src/ResText/POFile.cpp
index a2113fb0c..ca4379e62 100644
--- a/src/ResText/POFile.cpp
+++ b/src/ResText/POFile.cpp
@@ -147,6 +147,12 @@ BOOL CPOFile::ParseFile(LPCTSTR szPath, BOOL bUpdateExisting, bool bAdjustEOLs)
 				{
 					AdjustEOLs(resEntry.msgstr);
 				}
+				// always use the new data for generated comments/flags
+				auto newEntry = (*this)[msgid];
+				resEntry.automaticcomments = newEntry.automaticcomments;
+				resEntry.flag = newEntry.flag;
+				resEntry.resourceIDs = newEntry.resourceIDs;
+
 				(*this)[msgid] = resEntry;
 			}
 			msgid.clear();
-- 
2.11.4.GIT