diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-03 14:44:08 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-03 14:44:08 -0400 |
| commit | 56d18168a936e0d8ab43246d4496c5512778dd67 (patch) | |
| tree | 7a4d4a8aaa4b7c1b92c9ee696877b2f47e550665 | |
| parent | 5fb369f3e6ba1989cc365058f098d77ddf1ab20d (diff) | |
| parent | cc45ef896a551cdb7f7eaa8b78de4fb7fefd4160 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Installer/MainWindow.xaml.cs | 4 | ||||
| -rw-r--r-- | 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 3d60274b1..272ebbfad 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 0c11ceb04..a72fccfd4 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> |