Small fixes

ArtSword · Nov 17, 2017 · eae68b8 · eae68b8
1 parent 3e57c59
commit eae68b8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/Dopamine.Common/Controls/DopamineWindow.cs b/Dopamine.Common/Controls/DopamineWindow.cs
@@ -79,10 +79,6 @@ private void BorderlessWindowBase_CloseToolTipChanged(object sender, EventArgs e
             this.closeButton.ToolTip = this.CloseToolTip;
         }
 
-        /// <summary>
-        /// Custom Activate function because the real Activate function doesn't always bring the window on top.
-        /// </summary>
-        /// <remarks></remarks>
         public void ForceActivate()
         {
             // Prevent calling Activate() before Show() was called. Otherwise Activate() fails 
@@ -106,10 +102,6 @@ public void ForceActivate()
             t.Start();
         }
 
-        /// <summary>
-        /// Sets the border
-        /// </summary>
-        /// <remarks></remarks>
         public void SetWindowBorder(bool hasBorder)
         {
             this.hasBorder = hasBorder;
@@ -126,15 +118,19 @@ private void SetBorderThickness(Thickness borderThickness)
             this.previousBorderThickness = borderThickness;
         }
 
-        /// <summary>
-        /// The Deactivate function which goes together with ActivateNow
-        /// </summary>
-        /// <remarks></remarks>
         private void Deactivate()
         {
             System.Threading.Thread.Sleep(500);
             Application.Current.Dispatcher.Invoke(() => this.Topmost = this.oldTopMost);
-            System.Threading.Thread.CurrentThread.Abort();
+
+            try
+            {
+                System.Threading.Thread.CurrentThread.Abort();
+            }
+            catch (System.Exception)
+            {
+                // This fails sometimes. We don't care about it.
+            }
         }
     }
 }
diff --git a/Dopamine/ViewModels/InitializeViewModel.cs b/Dopamine/ViewModels/InitializeViewModel.cs
@@ -17,7 +17,6 @@ public string InitializeText
 
                 return $"Updating {ProductInformation.ApplicationName}";
             }
-        }
-
+        }   
     }
 }
diff --git a/Dopamine/Views/Initialize.xaml b/Dopamine/Views/Initialize.xaml
@@ -7,7 +7,7 @@
                          xmlns:prismMvvm="clr-namespace:Prism.Mvvm;assembly=Prism.Wpf"
                          xmlns:dc="clr-namespace:Digimezzo.WPFControls;assembly=Digimezzo.WPFControls"
                          mc:Ignorable="d"
-                         Title="Updating" Height="75" Width="350"
+                         Title="Dopamine" Height="75" Width="350"
                          Background="#0B0B0B"
                          ShowWindowControls="False"
                          Loaded="Window_Loaded"
@@ -20,8 +20,7 @@
                          Height="30" 
                          VerticalAlignment="Center"
                          Foreground="#1D7DD4" 
-                         IsActive="{Binding IsBusy}" 
-                         Visibility="{Binding IsBusy,Converter={StaticResource BooleanToCollapsedConverter}}"/>
+                         IsActive="True"/>
         <TextBlock Text="{Binding InitializeText}" VerticalAlignment="Center" Margin="30,0,0,0" FontSize="22" FontWeight="Light" Foreground="White"/>
     </DockPanel>
 </controls:DopamineWindow>
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ public string InitializeText @@
                     return $"Updating {ProductInformation.ApplicationName}";
                 }
-            }
+            }
         }
     }