No commit message

DavidXanatos · Mar 20, 2020 · 07ebc64 · 07ebc64
1 parent e670176
commit 07ebc64
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.75b] - 2020-03-20
+### Fixed
+- crash issue with notification window
 
 ## [0.75] - 2020-02-18
 

diff --git a/PrivateWin10/Core/Tweaks/TweakStore.cs b/PrivateWin10/Core/Tweaks/TweakStore.cs
@@ -167,6 +167,11 @@ static public bool InitTweaks(Dictionary<string, Category> Categories)
                 Value = 0,
                 Hint = Tweak.Hints.Optional
             });
+            telemetry.Add(new Tweak("Device Census", TweakType.DisableTask, WinVer.Win7)
+            {
+                Path = @"\Microsoft\Windows\Device Information",
+                Key = "Device"
+            });
             //Disable file Diagtrack-Listener.etl
             //(Disable file diagtrack.dll)
             //(Disable file BthTelemetry.dll)
@@ -437,7 +442,8 @@ static public bool InitTweaks(Dictionary<string, Category> Categories)
             {
                 Path= @"SYSTEM\CurrentControlSet\Services\SecurityHealthService",
                 Key = "Start",
-                Value = 4
+                Value = 4,
+                Hint = Tweak.Hints.Optional
             });
 
 

diff --git a/PrivateWin10/MainWindow.xaml.cs b/PrivateWin10/MainWindow.xaml.cs
@@ -134,7 +134,7 @@ public MainWindow()
             bool HasEngine = App.client.IsConnected();
 
             notificationWnd = new NotificationWnd(HasEngine);
-            //notificationWnd.Closed += NotificationClosed;
+            notificationWnd.Closed += NotificationClosed;
 
             mPages.Add("Overview", new PageItem(new OverviewPage()));
             mPages.Add("Privacy", new PageItem(new PrivacyPage()));
@@ -213,25 +213,26 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
                     (page.ctrl as IUserPage).OnClose();
             }
 
-            if (notificationWnd != null)
-                notificationWnd.CloseWnd();
-
             if (App.TrayIcon.Visible)
             {
                 e.Cancel = true;
                 this.Hide();
+                return;
             }
+
+            if (notificationWnd != null)
+                notificationWnd.CloseWnd();
         }
 
         private void Window_Closed(object sender, EventArgs e)
         {
 
         }
 
-        /*void NotificationClosed(object sender, EventArgs e)
+        void NotificationClosed(object sender, EventArgs e)
         {
-            notificationWnd = null;
-        }*/
+            //notificationWnd = null;
+        }
 
         public void UpdateEnabled()
         {

diff --git a/PrivateWin10/Pages/PrivacyPage.xaml.cs b/PrivateWin10/Pages/PrivacyPage.xaml.cs
@@ -38,7 +38,8 @@ public PrivacyPage()
 
         public void OnChange(object sender, TweakManager.TweakEventArgs args)
         {
-            App.MainWnd.notificationWnd.NotifyTweak(args);
+            if(App.MainWnd != null)
+                App.MainWnd.notificationWnd.NotifyTweak(args);
         }
 
         public void OnShow()

diff --git a/PrivateWin10/Properties/AssemblyInfo.cs b/PrivateWin10/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 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("0.75.0.0")]
-[assembly: AssemblyFileVersion("0.75.0.0")]
+[assembly: AssemblyVersion("0.75.0.2")]
+[assembly: AssemblyFileVersion("0.75.0.2")]