From 2498ecbc847610dfe34ab23b801572a147bd7934 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Tue, 21 Jan 2014 16:49:34 -0800
Subject: Windows compile fixes, check if running as administrator on startup
 for Windows.

---
 windows/ZeroTierOne/ZeroTierOne.vcxproj | 8 ++++----
 windows/ZeroTierOneService/Service.cs   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'windows')

diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj
index a1c61658..f739ea1a 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj
@@ -151,22 +151,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetExt>.exe</TargetExt>
     <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one-x86</TargetName>
+    <TargetName>zerotier-one_x86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetExt>.exe</TargetExt>
     <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one-x86</TargetName>
+    <TargetName>zerotier-one_x86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetExt>.exe</TargetExt>
     <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one-x64</TargetName>
+    <TargetName>zerotier-one_x64</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetExt>.exe</TargetExt>
     <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one-x64</TargetName>
+    <TargetName>zerotier-one_x64</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/windows/ZeroTierOneService/Service.cs b/windows/ZeroTierOneService/Service.cs
index f706802a..4ac11bd0 100644
--- a/windows/ZeroTierOneService/Service.cs
+++ b/windows/ZeroTierOneService/Service.cs
@@ -45,6 +45,7 @@ namespace ZeroTierOneService
 
         private void ztService_Exited(object sender, System.EventArgs e)
         {
+            ztService = null;
         }
 
         private string ztHome;
-- 
cgit v1.2.3