Fix re-enable issue and removed port number

gotdibbs · Jul 1, 2015 · b388dbe · b388dbe
1 parent b7f5ff3
commit b388dbe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/Imposter.Fiddler/Imposter.cs b/Imposter.Fiddler/Imposter.cs
@@ -105,7 +105,7 @@ private void LoadProfileItems(string checkedProfile = null)
             _profiles.DropDownItems.Add(addNew);
             _profiles.DropDownItems.Add(new ToolStripSeparator());
 
-            foreach (var profile in _settings.Profiles)
+            foreach (var profile in _settings.Profiles.OrderBy(p => p.Name))
             {
                 var item = new ToolStripMenuItem(profile.Name);
                 item.Tag = profile.ProfileId;
@@ -223,7 +223,7 @@ private void ProfileEdit_Click(object sender, EventArgs e)
                 _settings.Profiles.Add(profileEditor.Profile);
                 _settings.Save();
 
-                if (IsEnabled && item.Checked)
+                if (IsEnabled && parent.Checked)
                 {
                     _enabledProfiles.RemoveAll(p => p.ProfileId == (Guid)parent.Tag);
                     _enabledProfiles.Add(profileEditor.Profile);

diff --git a/Imposter.Fiddler/Properties/AssemblyInfo.cs b/Imposter.Fiddler/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.2")]
-[assembly: AssemblyFileVersion("1.0.0.2")]
+[assembly: AssemblyVersion("1.0.0.3")]
+[assembly: AssemblyFileVersion("1.0.0.3")]
 [assembly: Fiddler.RequiredVersion("2.2.8.6")]
diff --git a/Imposter.Fiddler/Views/ProfileEditor.xaml b/Imposter.Fiddler/Views/ProfileEditor.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
-        Title="Edit Profile" Height="500" Width="500" WindowStyle="ToolWindow"
+        Title="Edit Profile" Height="460" Width="500" WindowStyle="ToolWindow"
         WindowTransitionsEnabled="False"
         Background="#FFF">
     <Window.Resources>
@@ -78,9 +78,6 @@
 
             <TextBlock Margin="5,0">Local Directory (C:\source\project\web)</TextBlock>
             <TextBox x:Name="Local" Margin="5" />
-
-            <TextBlock Margin="5,0">Port</TextBlock>
-            <TextBox x:Name="Port" Text="8877" Margin="5" />
 
             <GroupBox Header="Overrides">
                 <StackPanel Margin="0">
@@ -110,7 +107,7 @@
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="5" Grid.Row="1">
-            <Button Content="Save" Height="44" Width="150" x:Name="Save" Margin="0,0,5,0" IsDefault="True"></Button>
+            <Button Content="Save" Height="44" Width="150" x:Name="Save" Margin="0,0,5,0" IsDefault="False"></Button>
             <Button Content="Cancel" Height="44" Width="150" x:Name="Cancel" Margin="0,0,5,0" IsCancel="True"></Button>
         </StackPanel>