uninstaller & firewall fixes

Author: 2trvl

Clab/network/network.cs

@@ -126,7 +126,11 @@ public static void run_as_admin()
                 }
                 catch (Exception)
                 {
-                    MessageBox.Show("Please run Clab as administrator next time. This is required to configure the firewall");
+                    MessageBox.Show(new Form { TopMost = true }, 
+                                    "Please run Clab as administrator next time. This is required to configure the firewall",
+                                    "Firewall Configuration [Access Denied]",
+                                    MessageBoxButtons.OK,
+                                    MessageBoxIcon.Exclamation);
                 }
 
                 Environment.Exit(0);

ClabUninstall/ClabUninstall.csproj

@@ -6,6 +6,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Version>0.0.1</Version>
     <ApplicationIcon>icon\uninstall.ico</ApplicationIcon>
+    <AssemblyName>uninstall</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,4 +21,10 @@
     </COMReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="uninstall.cmd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

ClabUninstall/icon/uninstall.ico

@@ -1,4 +1,7 @@
 @echo off
 set filepath=%1
 cd ..
-start cmd.exe /k "timeout 2 > NUL && rmdir /s /q %filepath%"
+tasklist | find /i "Clab.exe" && taskkill /im Clab.exe /F || echo "Clab.exe" not running
+echo Uninstalling Clab...
+timeout 2 > NUL
+rmdir /s /q %filepath%