From dad0e8517e76b88c8667d4255e3d6283878dbad3 Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Tue, 3 Oct 2017 08:19:40 +0300
Subject: Safe kernel flash with console autodetect

---
 MainForm.cs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'MainForm.cs')

diff --git a/MainForm.cs b/MainForm.cs
index d24e388a..a8770378 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -766,7 +766,7 @@ namespace com.clusterrr.hakchi_gui
 
         DialogResult RequireKernelDump()
         {
-            if (File.Exists(WorkerForm.KernelDump)) return DialogResult.OK; // OK - already dumped
+            if (File.Exists(WorkerForm.KernelDumpPath)) return DialogResult.OK; // OK - already dumped
             // Asking user to dump kernel
             if (MessageBox.Show(Resources.NoKernelWarning, Resources.NoKernel, MessageBoxButtons.YesNo, MessageBoxIcon.Warning)
                 == System.Windows.Forms.DialogResult.Yes)
@@ -782,11 +782,7 @@ namespace com.clusterrr.hakchi_gui
         DialogResult RequirePatchedKernel()
         {
             if (ConfigIni.CustomFlashed) return DialogResult.OK; // OK - already flashed
-            var kernelDump = RequireKernelDump(); // We need kernel dump first
-            if (kernelDump == System.Windows.Forms.DialogResult.No)
-                return DialogResult.No; // Abort if user has not dumped it
-            if (MessageBox.Show((kernelDump == DialogResult.Yes ? (Resources.KernelDumped + "\r\n") : "") +
-                    Resources.CustomWarning, Resources.CustomKernel, MessageBoxButtons.YesNo, MessageBoxIcon.Warning)
+            if (MessageBox.Show(Resources.CustomWarning, Resources.CustomKernel, MessageBoxButtons.YesNo, MessageBoxIcon.Warning)
                     == System.Windows.Forms.DialogResult.Yes)
             {
                 if (FlashCustomKernel())
@@ -1060,7 +1056,7 @@ namespace com.clusterrr.hakchi_gui
 
         private void dumpKernelToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (File.Exists(WorkerForm.KernelDump))
+            if (File.Exists(WorkerForm.KernelDumpPath))
             {
                 MessageBox.Show(Resources.ReplaceKernelQ, Resources.Warning, MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 return;
@@ -1094,7 +1090,6 @@ namespace com.clusterrr.hakchi_gui
 
         private void flashCustomKernelToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (RequireKernelDump() == DialogResult.No) return;
             if (MessageBox.Show(Resources.CustomKernelQ, Resources.AreYouSure, MessageBoxButtons.YesNo, MessageBoxIcon.Warning)
                 == System.Windows.Forms.DialogResult.Yes)
             {
@@ -1104,7 +1099,7 @@ namespace com.clusterrr.hakchi_gui
 
         private void membootOriginalKernelToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (!File.Exists(WorkerForm.KernelDump))
+            if (!File.Exists(WorkerForm.KernelDumpPath))
             {
                 MessageBox.Show(Resources.NoKernelYouNeed, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
@@ -1121,7 +1116,7 @@ namespace com.clusterrr.hakchi_gui
 
         private void flashOriginalKernelToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (!File.Exists(WorkerForm.KernelDump))
+            if (!File.Exists(WorkerForm.KernelDumpPath))
             {
                 MessageBox.Show(Resources.NoKernelYouNeed, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
@@ -1135,7 +1130,7 @@ namespace com.clusterrr.hakchi_gui
 
         private void uninstallToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (!File.Exists(WorkerForm.KernelDump))
+            if (!File.Exists(WorkerForm.KernelDumpPath))
             {
                 MessageBox.Show(Resources.NoKernelYouNeed, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
@@ -1295,7 +1290,7 @@ namespace com.clusterrr.hakchi_gui
 
         private void MainForm_Shown(object sender, EventArgs e)
         {
-            if (ConfigIni.FirstRun && !File.Exists(WorkerForm.KernelDump))
+            if (ConfigIni.FirstRun && !File.Exists(WorkerForm.KernelDumpPath))
             {
                 MessageBox.Show(this, Resources.FirstRun + "\r\n\r\n" + Resources.Donate, Resources.Hello, MessageBoxButtons.OK, MessageBoxIcon.Information);
                 ConfigIni.FirstRun = false;
-- 
cgit v1.2.3