• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28950 (tree)
Zeit2020-07-15 03:48:09
Autorstefankueng

Log Message

Don't use the selected index if the property name is specified.

Ändern Zusammenfassung

Diff

--- trunk/src/Changelog.txt (revision 28949)
+++ trunk/src/Changelog.txt (revision 28950)
@@ -8,6 +8,9 @@
88 file contained an utf8 BOM. (Stefan)
99 - BUG: Crash in ProjectMonitor when rearranging
1010 the tree view. (Stefan)
11+- BUG: opening the properties dialog from command
12+ line with param /property showed wrong or
13+ empty values. (Stefan)
1114
1215 Version 1.14.0
1316 See the release notes: https://tortoisesvn.net/tsvn_1.14_releasenotes.html
--- trunk/src/TortoiseProc/Properties/EditPropertiesDlg.cpp (revision 28949)
+++ trunk/src/TortoiseProc/Properties/EditPropertiesDlg.cpp (revision 28950)
@@ -739,10 +739,15 @@
739739 if (propName.size())
740740 dlg->SetPropertyName(sName);
741741 dlg->SetPathList(m_pathlist);
742- if (m_properties.find(sName) != m_properties.end())
742+ auto foundIt = m_properties.find(sName);
743+ if (foundIt != m_properties.end())
743744 {
744745 // the property already exists: switch to "edit" instead of "add"
745- PropValue * prop = (PropValue*)m_propList.GetItemData(selIndex);
746+ PropValue* prop = nullptr;
747+ if (selIndex >= 0 && propName.empty())
748+ prop = (PropValue*)m_propList.GetItemData(selIndex);
749+ else
750+ prop = &foundIt->second;
746751 dlg->SetPropertyName(sName);
747752 if (prop->allthesamevalue && !prop->isinherited)
748753 dlg->SetPropertyValue(prop->value);
Show on old repository browser