diff --git a/Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs b/Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs
index 035a4ed..a072aca 100644
--- a/Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs
+++ b/Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs
@@ -215,11 +215,8 @@ namespace PersistentWindows.Common
             File.WriteAllText(Path.Combine(appDataFolder, snapshotTimeFile), xml2, Encoding.Unicode);
         }
 
-        public void WriteDataDump()
+        private void WriteDataDumpCore()
         {
-            if (!dumpDataWhenExit)
-                return;
-
             DataContractSerializer dcs = new DataContractSerializer(typeof(Dictionary<string, Dictionary<IntPtr, List<ApplicationDisplayMetrics>>>));
             StringBuilder sb = new StringBuilder();
             using (XmlWriter xw = XmlWriter.Create(sb))
@@ -231,6 +228,18 @@ namespace PersistentWindows.Common
 
             DumpSnapshotTakenTime();
         }
+        public void WriteDataDump()
+        {
+            try
+            {
+                if (dumpDataWhenExit)
+                    WriteDataDumpCore();
+            }
+            catch (Exception e)
+            {
+                Log.Error(e.ToString());
+            }
+        }
 
         private void ReadDataDump()
         {
diff --git a/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs b/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
index e61847e..5f107f2 100644
--- a/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
+++ b/Ninjacrab.PersistentWindows.Solution/SystrayShell/Program.cs
@@ -812,14 +812,7 @@ namespace PersistentWindows.SystrayShell
 
         public static void WriteDataDump()
         {
-            try
-            {
-                pwp.WriteDataDump();
-            }
-            catch (Exception e)
-            {
-                Log.Error(e.ToString());
-            }
+            pwp.WriteDataDump();
         }
     }
 }