1.7.4

Codectory · Codectory · commit 9e865e001cbe · 2021-11-30T14:29:07.000+01:00
[Bug fixes] - Crash after rename profile and select another one #34
diff --git a/Source/HDRProfile/AutoHDRDaemon.cs b/Source/HDRProfile/AutoHDRDaemon.cs
@@ -407,20 +407,26 @@ private void MoveAssignmentUp(ApplicationProfileAssignment assignment)
 
         private void AddProfile()
         {
-            int count = 0;
-            string profileName = string.Empty;
-            while (string.IsNullOrEmpty(profileName) ||  Settings.ApplicationProfiles.Any(p => p.Name.ToUpperInvariant().Equals(profileName.ToUpperInvariant())))
+            lock (_accessLock)
             {
-                count++;
-                profileName = $"{ProjectResources.Locale_Texts.Profile} {count}";
+                int count = 0;
+                string profileName = string.Empty;
+                while (string.IsNullOrEmpty(profileName) || Settings.ApplicationProfiles.Any(p => p.Name.ToUpperInvariant().Equals(profileName.ToUpperInvariant())))
+                {
+                    count++;
+                    profileName = $"{ProjectResources.Locale_Texts.Profile} {count}";
+                }
+                Settings.ApplicationProfiles.Add(new Profile() { Name = profileName });
             }
-            Settings.ApplicationProfiles.Add(new Profile() { Name = profileName });
         }
 
 
         private void RemoveProfile(Profile profile)
         {
-            Settings.ApplicationProfiles.Remove(profile);
+            lock (_accessLock)
+            {
+                Settings.ApplicationProfiles.Remove(profile);
+            }
         }
 
         #endregion Process handling 
diff --git a/Source/HDRProfile/Profiles/Profile.cs b/Source/HDRProfile/Profiles/Profile.cs
@@ -178,7 +178,7 @@ public void RemoveProfileAction(ProfileActionListType listType, ProfileActionBas
 
         public override string ToString()
         {
-            return Name;
+            return $"{Name} {GetHashCode()}";
         }
 
         public override bool Equals(object obj)
@@ -189,7 +189,7 @@ public override bool Equals(object obj)
         public bool Equals(Profile other)
         {
             return other != null &&
-                   Name == other.Name &&
+                   GUID == other._guid &&
                    EqualityComparer<ListOfProfileActions>.Default.Equals(ApplicationStarted, other.ApplicationStarted) &&
                    EqualityComparer<ListOfProfileActions>.Default.Equals(ApplicationClosed, other.ApplicationClosed) &&
                    EqualityComparer<ListOfProfileActions>.Default.Equals(ApplicationGotFocus, other.ApplicationGotFocus) &&
@@ -199,7 +199,7 @@ public bool Equals(Profile other)
         public override int GetHashCode()
         {
             int hashCode = 210938521;
-            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Name);
+            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(GUID.ToString());
             hashCode = hashCode * -1521134295 + EqualityComparer<ListOfProfileActions>.Default.GetHashCode(ApplicationStarted);
             hashCode = hashCode * -1521134295 + EqualityComparer<ListOfProfileActions>.Default.GetHashCode(ApplicationClosed);
             hashCode = hashCode * -1521134295 + EqualityComparer<ListOfProfileActions>.Default.GetHashCode(ApplicationGotFocus);
diff --git a/Source/HDRProfile/Properties/AssemblyInfo.cs b/Source/HDRProfile/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.3.0")]
-[assembly: AssemblyFileVersion("1.7.3.0")]
+[assembly: AssemblyVersion("1.7.4.0")]
+[assembly: AssemblyFileVersion("1.7.4.0")]
diff --git a/Source/HDRProfile/Views/ProfileManagerView.xaml b/Source/HDRProfile/Views/ProfileManagerView.xaml
@@ -24,7 +24,7 @@
 
             <Border Style="{StaticResource RoundedBorder}" BorderBrush="{DynamicResource AccentBrush}" BorderThickness="1" Margin="10,10,10,10" Grid.Row="0">
                 <Grid>
-                    <TextBlock  Text="{Binding Name}" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"  FontWeight="DemiBold"/>
+                    <TextBlock  Text="{Binding Name, Mode=OneWay}" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"  FontWeight="DemiBold"/>
                 </Grid>
             </Border>
         </DataTemplate>
@@ -74,12 +74,12 @@
         <TextBlock  Grid.Column="0"  Grid.Row="0"   Text="{x:Static pres:Locale_Texts.Profiles}" Margin="10,10,10,10" FontWeight="Bold" FontSize="18"></TextBlock>
         <TextBlock  Grid.Column="1"  Grid.Row="0"   Text="{x:Static pres:Locale_Texts.CurrentProfile}" Margin="10,10,10,10" FontWeight="Bold" FontSize="18"></TextBlock>
         <Border Grid.Column="0"   Grid.Row="1"  Style="{StaticResource RoundedBorder}" BorderBrush="{DynamicResource AccentBrush}" BorderThickness="1" Margin="10,10,10,10">
-            <ListBox   x:Name="ProfileList"  HorizontalContentAlignment="Stretch"  ItemTemplate="{StaticResource ProfileItemTemplate}" ItemsSource="{Binding Settings.ApplicationProfiles}" ScrollViewer.VerticalScrollBarVisibility="Auto"  Background="{x:Null}"  BorderThickness="0"/>
+            <ListBox   x:Name="ProfileList"  HorizontalContentAlignment="Stretch"  ItemTemplate="{StaticResource ProfileItemTemplate}" ItemsSource="{Binding Settings.ApplicationProfiles}" ScrollViewer.VerticalScrollBarVisibility="Auto"  Background="{x:Null}" BorderThickness="0" SelectionMode="Single"/>
         </Border>
         <Border Grid.Column="1" Grid.Row="1"  Style="{StaticResource RoundedBorder}" BorderBrush="{DynamicResource AccentBrush}" BorderThickness="1" Margin="10,10,10,10">
             <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
             <!--<Grid  Margin="5" DataContext="{Binding ElementName=ProfileList, Path=SelectedItem}">-->
-                   <Grid  Margin="5" DataContext="{Binding ElementName=ProfileList, Path=SelectedItem}" Visibility="{Binding  ElementName=ProfileList, Path=SelectedItem, Converter={StaticResource NotNullVisibilityConverter}}" > 
+                <Grid  Margin="5" DataContext="{Binding ElementName=ProfileList, Path=SelectedItem, Mode=OneWay}" Visibility="{Binding  ElementName=ProfileList, Path=SelectedItem,Mode=OneWay, Converter={StaticResource NotNullVisibilityConverter}}" > 
 
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
@@ -104,7 +104,7 @@
                     <TextBlock  Grid.Column="0"  Grid.Row="4"   Text="{x:Static pres:Locale_Texts.AppClosedActions}" FontWeight="DemiBold" FontSize="15" Margin="5"></TextBlock>
                     <TextBlock  Grid.Column="0"  Grid.Row="5"   Text="{x:Static pres:Locale_Texts.AppFocusedActions}" FontWeight="DemiBold" FontSize="15" Margin="5"></TextBlock>
                     <TextBlock  Grid.Column="0"  Grid.Row="6"   Text="{x:Static pres:Locale_Texts.AppLostFocusActions}" FontWeight="DemiBold" FontSize="15" Margin="5"></TextBlock>
-                    <TextBox Grid.Column="1"  Grid.Row="0"   Text="{Binding Name, Mode=TwoWay}" Margin="10,5" FontSize="15" FontWeight="DemiBold" ></TextBox>
+                    <TextBox x:Name="NameTextBox" Grid.Column="1"  Grid.Row="0"   Text="{Binding Name, Mode=TwoWay}" Margin="10,5" FontSize="15" FontWeight="DemiBold"></TextBox>
                     <CheckBox  Grid.Column="1" Grid.Row="1" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" IsChecked="{Binding RestartApplication, Mode=TwoWay}" VerticalAlignment="Center" Margin="10,0,0,0" HorizontalAlignment="Left"  />
 
                     <Border Grid.Column="1"  Grid.Row="3"  Style="{StaticResource RoundedBorder}" BorderBrush="{DynamicResource AccentBrush}" BorderThickness="1" Margin="10,10,10,10">
diff --git a/Source/HDRProfile/Views/ProfileManagerView.xaml.cs b/Source/HDRProfile/Views/ProfileManagerView.xaml.cs
@@ -12,6 +12,5 @@ public ProfileManagerView()
         {
             InitializeComponent();
         }
-
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -407,20 +407,26 @@ private void MoveAssignmentUp(ApplicationProfileAssignment assignment)`
`407`	`407`
`408`	`408`	`private void AddProfile()`
`409`	`409`	`{`
`410`		`- int count = 0;`
`411`		`- string profileName = string.Empty;`
`412`		`- while (string.IsNullOrEmpty(profileName) \|\| Settings.ApplicationProfiles.Any(p => p.Name.ToUpperInvariant().Equals(profileName.ToUpperInvariant())))`
	`410`	`+ lock (_accessLock)`
`413`	`411`	`{`
`414`		`- count++;`
`415`		`- profileName = $"{ProjectResources.Locale_Texts.Profile} {count}";`
	`412`	`+ int count = 0;`
	`413`	`+ string profileName = string.Empty;`
	`414`	`+ while (string.IsNullOrEmpty(profileName) \|\| Settings.ApplicationProfiles.Any(p => p.Name.ToUpperInvariant().Equals(profileName.ToUpperInvariant())))`
	`415`	`+ {`
	`416`	`+ count++;`
	`417`	`+ profileName = $"{ProjectResources.Locale_Texts.Profile} {count}";`
	`418`	`+ }`
	`419`	`+ Settings.ApplicationProfiles.Add(new Profile() { Name = profileName });`
`416`	`420`	`}`
`417`		`- Settings.ApplicationProfiles.Add(new Profile() { Name = profileName });`
`418`	`421`	`}`
`419`	`422`
`420`	`423`
`421`	`424`	`private void RemoveProfile(Profile profile)`
`422`	`425`	`{`
`423`		`- Settings.ApplicationProfiles.Remove(profile);`
	`426`	`+ lock (_accessLock)`
	`427`	`+ {`
	`428`	`+ Settings.ApplicationProfiles.Remove(profile);`
	`429`	`+ }`
`424`	`430`	`}`
`425`	`431`
`426`	`432`	`#endregion Process handling`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ public void RemoveProfileAction(ProfileActionListType listType, ProfileActionBas`
`178`	`178`
`179`	`179`	`public override string ToString()`
`180`	`180`	`{`
`181`		`- return Name;`
	`181`	`+ return $"{Name} {GetHashCode()}";`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`public override bool Equals(object obj)`
`@@ -189,7 +189,7 @@ public override bool Equals(object obj)`
`189`	`189`	`public bool Equals(Profile other)`
`190`	`190`	`{`
`191`	`191`	`return other != null &&`
`192`		`- Name == other.Name &&`
	`192`	`+ GUID == other._guid &&`
`193`	`193`	`EqualityComparer<ListOfProfileActions>.Default.Equals(ApplicationStarted, other.ApplicationStarted) &&`
`194`	`194`	`EqualityComparer<ListOfProfileActions>.Default.Equals(ApplicationClosed, other.ApplicationClosed) &&`
`195`	`195`	`EqualityComparer<ListOfProfileActions>.Default.Equals(ApplicationGotFocus, other.ApplicationGotFocus) &&`
`@@ -199,7 +199,7 @@ public bool Equals(Profile other)`
`199`	`199`	`public override int GetHashCode()`
`200`	`200`	`{`
`201`	`201`	`int hashCode = 210938521;`
`202`		`- hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Name);`
	`202`	`+ hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(GUID.ToString());`
`203`	`203`	`hashCode = hashCode * -1521134295 + EqualityComparer<ListOfProfileActions>.Default.GetHashCode(ApplicationStarted);`
`204`	`204`	`hashCode = hashCode * -1521134295 + EqualityComparer<ListOfProfileActions>.Default.GetHashCode(ApplicationClosed);`
`205`	`205`	`hashCode = hashCode * -1521134295 + EqualityComparer<ListOfProfileActions>.Default.GetHashCode(ApplicationGotFocus);`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,5 @@ public ProfileManagerView()`
`12`	`12`	`{`
`13`	`13`	`InitializeComponent();`
`14`	`14`	`}`
`15`		`-`
`16`	`15`	`}`
`17`	`16`	`}`