From cc45ef896a551cdb7f7eaa8b78de4fb7fefd4160 Mon Sep 17 00:00:00 2001
From: Eric Reed <ebr@mediabrowser3.com>
Date: Wed, 3 Apr 2013 14:42:32 -0400
Subject: [PATCH] Put a timout on the wait for mb server to shutdown in
 installer

---
 MediaBrowser.Installer/MainWindow.xaml.cs            | 4 +++-
 MediaBrowser.Installer/MediaBrowser.Installer.csproj | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs
index 3d60274b1f..272ebbfad1 100644
--- a/MediaBrowser.Installer/MainWindow.xaml.cs
+++ b/MediaBrowser.Installer/MainWindow.xaml.cs
@@ -118,6 +118,8 @@ namespace MediaBrowser.Installer
                 {
                     // wasn't running
                 }
+
+                Thread.Sleep(500); // give it just another sec to be sure its really gone
             }
 
             //MessageBox.Show(string.Format("Called with args: product: {0} archive: {1} caller: {2}", product, Archive, callerId));
@@ -168,7 +170,7 @@ namespace MediaBrowser.Installer
                         client.UploadString("http://localhost:8096/mediabrowser/System/Shutdown", "");
                         try
                         {
-                            server.WaitForExit();
+                            server.WaitForExit(30000); //don't hang indefinitely
                         }
                         catch (ArgumentException)
                         {
diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
index 0c11ceb040..a72fccfd49 100644
--- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj
+++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
@@ -31,7 +31,7 @@
     <PublisherName>Media Browser Team</PublisherName>
     <SuiteName>Media Browser</SuiteName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>53</ApplicationRevision>
+    <ApplicationRevision>55</ApplicationRevision>
     <ApplicationVersion>0.1.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>