Compare commits
2 Commits
1.0.3-beta
...
1.0.3-beta
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c826f42fd | ||
|
|
4022cf12a0 |
@@ -9,7 +9,8 @@
|
|||||||
<description>A Path of Exile loot filter script editor</description>
|
<description>A Path of Exile loot filter script editor</description>
|
||||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
<copyright>Copyright 2018</copyright>
|
<copyright>Copyright 2018</copyright>
|
||||||
<releaseNotes>* Added missing AlertSound mp3 resources to installer</releaseNotes>
|
<releaseNotes>* Added missing AlertSound mp3 resources to installer
|
||||||
|
* Fixed a crash related to performing certain commands with no blocks selected</releaseNotes>
|
||||||
<dependencies />
|
<dependencies />
|
||||||
</metadata>
|
</metadata>
|
||||||
<files>
|
<files>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ using System.Runtime.CompilerServices;
|
|||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.0.3")]
|
[assembly: AssemblyVersion("1.0.3")]
|
||||||
[assembly: AssemblyInformationalVersion("1.0.3-beta1")]
|
[assembly: AssemblyInformationalVersion("1.0.3-beta2")]
|
||||||
|
|
||||||
[assembly: InternalsVisibleTo("Filtration.Tests")]
|
[assembly: InternalsVisibleTo("Filtration.Tests")]
|
||||||
[assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]
|
[assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]
|
||||||
|
|||||||
@@ -379,7 +379,7 @@ namespace Filtration.ViewModels
|
|||||||
{
|
{
|
||||||
for (var i = 0; i < SelectedBlockViewModels.Count; i++)
|
for (var i = 0; i < SelectedBlockViewModels.Count; i++)
|
||||||
{
|
{
|
||||||
if (!ViewItemFilterBlockViewModels.Contains(SelectedBlockViewModels[i]))
|
if (SelectedBlockViewModels[i] == null || !ViewItemFilterBlockViewModels.Contains(SelectedBlockViewModels[i]))
|
||||||
{
|
{
|
||||||
SelectedBlockViewModels.RemoveAt(i--);
|
SelectedBlockViewModels.RemoveAt(i--);
|
||||||
}
|
}
|
||||||
@@ -554,6 +554,8 @@ namespace Filtration.ViewModels
|
|||||||
|
|
||||||
public bool CanModifySelectedBlocks()
|
public bool CanModifySelectedBlocks()
|
||||||
{
|
{
|
||||||
|
ValidateSelectedBlocks();
|
||||||
|
|
||||||
if (SelectedBlockViewModels.Count < 1)
|
if (SelectedBlockViewModels.Count < 1)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -570,6 +572,9 @@ namespace Filtration.ViewModels
|
|||||||
|
|
||||||
public bool CanModifyBlock(IItemFilterBlockViewModelBase itemFilterBlock)
|
public bool CanModifyBlock(IItemFilterBlockViewModelBase itemFilterBlock)
|
||||||
{
|
{
|
||||||
|
if (itemFilterBlock == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
if (itemFilterBlock is IItemFilterBlockViewModel)
|
if (itemFilterBlock is IItemFilterBlockViewModel)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user